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 /miext/shadow | |
| 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 'miext/shadow')
| -rw-r--r-- | miext/shadow/shadow.c | 6 | ||||
| -rw-r--r-- | miext/shadow/shalloc.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/miext/shadow/shadow.c b/miext/shadow/shadow.c index 608ccd234..e027e76d9 100644 --- a/miext/shadow/shadow.c +++ b/miext/shadow/shadow.c @@ -107,7 +107,7 @@ shadowCloseScreen(int i, ScreenPtr pScreen) #endif if (pBuf->pPixmap) pScreen->DestroyPixmap(pBuf->pPixmap); - xfree(pBuf); + free(pBuf); return pScreen->CloseScreen(i, pScreen); } @@ -139,7 +139,7 @@ shadowSetup(ScreenPtr pScreen) if (!DamageSetup(pScreen)) return FALSE; - pBuf = xalloc(sizeof(shadowBufRec)); + pBuf = malloc(sizeof(shadowBufRec)); if (!pBuf) return FALSE; #ifdef BACKWARDS_COMPATIBILITY @@ -154,7 +154,7 @@ shadowSetup(ScreenPtr pScreen) TRUE, pScreen, pScreen); #endif if (!pBuf->pDamage) { - xfree(pBuf); + free(pBuf); return FALSE; } diff --git a/miext/shadow/shalloc.c b/miext/shadow/shalloc.c index 72aa28b14..f57cb5266 100644 --- a/miext/shadow/shalloc.c +++ b/miext/shadow/shalloc.c @@ -45,6 +45,6 @@ shadowAlloc (int width, int height, int bpp) /* Cant use PixmapBytePad -- the structure is probably not initialized yet */ stride = BitmapBytePad (width * bpp); - fb = xalloc (stride * height); + fb = malloc(stride * height); return fb; } |