diff options
| author | Mikhail Gusarov <dottedmag@dottedmag.net> | 2010-05-06 01:44:06 +0700 |
|---|---|---|
| committer | Mikhail Gusarov <dottedmag@dottedmag.net> | 2010-05-13 00:22:37 +0700 |
| commit | 3f3ff971ecff9936cebafc813af9193b97bba89c (patch) | |
| tree | fdbbad794a42488b7ffe41eed7aba4e498335f55 /mi/mioverlay.c | |
| parent | 96c7ab27c383ec767f62a7a11e5fd76f86363fbc (diff) | |
Replace X-allocation functions with their C89 counterparts
The only remaining X-functions used in server are XNF*, the rest is converted to
plain alloc/calloc/realloc/free/strdup.
X* functions are still exported from server and x* macros are still defined in
header file, so both ABI and API are not affected by this change.
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'mi/mioverlay.c')
| -rw-r--r-- | mi/mioverlay.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mi/mioverlay.c b/mi/mioverlay.c index e0aa88017..2de768215 100644 --- a/mi/mioverlay.c +++ b/mi/mioverlay.c @@ -115,7 +115,7 @@ miInitOverlay( if(!dixRequestPrivate(miOverlayWindowKey, sizeof(miOverlayWindowRec))) return FALSE; - if(!(pScreenPriv = xalloc(sizeof(miOverlayScreenRec)))) + if(!(pScreenPriv = malloc(sizeof(miOverlayScreenRec)))) return FALSE; dixSetPrivate(&pScreen->devPrivates, miOverlayScreenKey, pScreenPriv); @@ -166,7 +166,7 @@ miOverlayCloseScreen(int i, ScreenPtr pScreen) pScreen->UnrealizeWindow = pScreenPriv->UnrealizeWindow; pScreen->RealizeWindow = pScreenPriv->RealizeWindow; - xfree(pScreenPriv); + free(pScreenPriv); return (*pScreen->CloseScreen)(i, pScreen); } @@ -184,7 +184,7 @@ miOverlayCreateWindow(WindowPtr pWin) pWinPriv->tree = NULL; if(!pWin->parent || !((*pScreenPriv->InOverlay)(pWin))) { - if(!(pTree = (miOverlayTreePtr)xcalloc(1, sizeof(miOverlayTreeRec)))) + if(!(pTree = (miOverlayTreePtr)calloc(1, sizeof(miOverlayTreeRec)))) return FALSE; } @@ -212,7 +212,7 @@ miOverlayCreateWindow(WindowPtr pWin) REGION_INIT(pScreen, &(pTree->borderClip), &fullBox, 1); REGION_INIT(pScreen, &(pTree->clipList), &fullBox, 1); } - } else xfree(pTree); + } else free(pTree); } return TRUE; @@ -240,7 +240,7 @@ miOverlayDestroyWindow(WindowPtr pWin) REGION_UNINIT(pScreen, &(pTree->borderClip)); REGION_UNINIT(pScreen, &(pTree->clipList)); - xfree(pTree); + free(pTree); } if(pScreenPriv->DestroyWindow) { @@ -861,7 +861,7 @@ miOverlayHandleExposures(WindowPtr pWin) (*WindowExposures)(pTree->pWin,&mival->exposed,NullRegion); REGION_UNINIT(pScreen, &mival->exposed); } - xfree(mival); + free(mival); pTree->valdata = NULL; if (pTree->firstChild) { pTree = pTree->firstChild; @@ -899,7 +899,7 @@ miOverlayHandleExposures(WindowPtr pWin) } REGION_UNINIT(pScreen, &val->after.borderExposed); REGION_UNINIT(pScreen, &val->after.exposed); - xfree(val); + free(val); pChild->valdata = NULL; if (pChild->firstChild) { |