hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-23 01:29:58 +00:00
Code Issues Projects Releases Wiki Activity

Replace X-allocation functions with their C89 counterparts

Browse source 
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:
Mikhail Gusarov 2010-05-06 01:44:06 +07:00
commit 3f3ff971ec
345 changed files with 3011 additions and 3011 deletions
Download patch file Download diff file Expand all files Collapse all files

32
hw/xfree86/common/xf86cmap.c
View file

@ -155,17 +155,17 @@ Bool xf86HandleColormaps(
elements = 1 << sigRGBbits;
if(!(gamma = xalloc(elements * sizeof(LOCO))))
if(!(gamma = malloc(elements * sizeof(LOCO))))
return FALSE;
if(!(indices = xalloc(maxColors * sizeof(int)))) {
xfree(gamma);
if(!(indices = malloc(maxColors * sizeof(int)))) {
free(gamma);
return FALSE;
}
if(!(pScreenPriv = xalloc(sizeof(CMapScreenRec)))) {
xfree(gamma);
xfree(indices);
if(!(pScreenPriv = malloc(sizeof(CMapScreenRec)))) {
free(gamma);
free(indices);
return FALSE;
}
@ -261,11 +261,11 @@ CMapAllocateColormapPrivate(ColormapPtr pmap)
else
numColors = 1 << pmap->pVisual->nplanes;
if(!(colors = xalloc(numColors * sizeof(LOCO))))
if(!(colors = malloc(numColors * sizeof(LOCO))))
return FALSE;
if(!(pColPriv = xalloc(sizeof(CMapColormapRec)))) {
xfree(colors);
if(!(pColPriv = malloc(sizeof(CMapColormapRec)))) {
free(colors);
return FALSE;
}
@ -277,7 +277,7 @@ CMapAllocateColormapPrivate(ColormapPtr pmap)
pColPriv->overscan = -1;
/* add map to list */
pLink = xalloc(sizeof(CMapLink));
pLink = malloc(sizeof(CMapLink));
if(pLink) {
pLink->cmap = pmap;
pLink->next = pScreenPriv->maps;
@ -316,8 +316,8 @@ CMapDestroyColormap (ColormapPtr cmap)
CMapLinkPtr prevLink = NULL, pLink = pScreenPriv->maps;
if(pColPriv) {
if(pColPriv->colors) xfree(pColPriv->colors);
xfree(pColPriv);
if(pColPriv->colors) free(pColPriv->colors);
free(pColPriv);
}
/* remove map from list */
@ -327,7 +327,7 @@ CMapDestroyColormap (ColormapPtr cmap)
prevLink->next = pLink->next;
else
pScreenPriv->maps = pLink->next;
xfree(pLink);
free(pLink);
break;
}
prevLink = pLink;
@ -828,9 +828,9 @@ CMapUnwrapScreen(ScreenPtr pScreen)
pScrn->SetDGAMode = pScreenPriv->SetDGAMode;
pScrn->ChangeGamma = pScreenPriv->ChangeGamma;
xfree(pScreenPriv->gamma);
xfree(pScreenPriv->PreAllocIndices);
xfree(pScreenPriv);
free(pScreenPriv->gamma);
free(pScreenPriv->PreAllocIndices);
free(pScreenPriv);
}