mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 08:04:30 +00:00
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>
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user