mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-11 23:43:06 +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:
parent
96c7ab27c3
commit
3f3ff971ec
345 changed files with 3011 additions and 3011 deletions
|
|
@ -480,7 +480,7 @@ miInitializeCompositeWrapper(ScreenPtr pScreen)
|
|||
if (!dixRequestPrivate(cwGCKey, sizeof(cwGCRec)))
|
||||
return;
|
||||
|
||||
pScreenPriv = xalloc(sizeof(cwScreenRec));
|
||||
pScreenPriv = malloc(sizeof(cwScreenRec));
|
||||
if (!pScreenPriv)
|
||||
return;
|
||||
|
||||
|
|
@ -516,7 +516,7 @@ cwCloseScreen (int i, ScreenPtr pScreen)
|
|||
if (ps)
|
||||
cwFiniRender(pScreen);
|
||||
|
||||
xfree((pointer)pScreenPriv);
|
||||
free((pointer)pScreenPriv);
|
||||
|
||||
return (*pScreen->CloseScreen)(i, pScreen);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ cwCreatePicturePrivate (PicturePtr pPicture)
|
|||
int error;
|
||||
cwPicturePtr pPicturePrivate;
|
||||
|
||||
pPicturePrivate = xalloc (sizeof (cwPictureRec));
|
||||
pPicturePrivate = malloc(sizeof (cwPictureRec));
|
||||
if (!pPicturePrivate)
|
||||
return NULL;
|
||||
|
||||
|
|
@ -83,7 +83,7 @@ cwCreatePicturePrivate (PicturePtr pPicture)
|
|||
&error);
|
||||
if (!pPicturePrivate->pBackingPicture)
|
||||
{
|
||||
xfree (pPicturePrivate);
|
||||
free(pPicturePrivate);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
@ -107,7 +107,7 @@ cwDestroyPicturePrivate (PicturePtr pPicture)
|
|||
{
|
||||
if (pPicturePrivate->pBackingPicture)
|
||||
FreePicture (pPicturePrivate->pBackingPicture, 0);
|
||||
xfree (pPicturePrivate);
|
||||
free(pPicturePrivate);
|
||||
setCwPicture(pPicture, NULL);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue