SwallowOS/xserver_xsdl
1
0
Fork 0
Code Issues Pull Requests Packages 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
parent 96c7ab27c3
commit 3f3ff971ec
345 changed files with 3011 additions and 3011 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
miext/damage/damage.c
View File

@@ -1511,7 +1511,7 @@ damageText (DrawablePtr pDrawable,
imageblt = (textType == TT_IMAGE8) || (textType == TT_IMAGE16);
charinfo = xalloc(count * sizeof(CharInfoPtr));
charinfo = malloc(count * sizeof(CharInfoPtr));
if (!charinfo)
return x;
@@ -1533,7 +1533,7 @@ damageText (DrawablePtr pDrawable,
(*pGC->ops->PolyGlyphBlt)(pDrawable, pGC, x, y, n, charinfo,
FONTGLYPHS(pGC->font));
}
xfree(charinfo);
free(charinfo);
return x + w;
}
@@ -1848,7 +1848,7 @@ damageCloseScreen (int i, ScreenPtr pScreen)
unwrap (pScrPriv, pScreen, CreateGC);
unwrap (pScrPriv, pScreen, CopyWindow);
unwrap (pScrPriv, pScreen, CloseScreen);
xfree (pScrPriv);
free(pScrPriv);
return (*pScreen->CloseScreen) (i, pScreen);
}
@@ -1890,7 +1890,7 @@ DamageSetup (ScreenPtr pScreen)
if (!dixRequestPrivate(damageGCPrivateKey, sizeof(DamageGCPrivRec)))
return FALSE;
pScrPriv = xalloc (sizeof (DamageScrPrivRec));
pScrPriv = malloc(sizeof (DamageScrPrivRec));
if (!pScrPriv)
return FALSE;
@@ -1926,7 +1926,7 @@ DamageCreate (DamageReportFunc damageReport,
damageScrPriv(pScreen);
DamagePtr pDamage;
pDamage = xalloc (sizeof (DamageRec));
pDamage = malloc(sizeof (DamageRec));
if (!pDamage)
return 0;
pDamage->pNext = 0;
@@ -2054,7 +2054,7 @@ DamageDestroy (DamagePtr pDamage)
pDamage->devPrivates = NULL;
REGION_UNINIT (pScreen, &pDamage->damage);
REGION_UNINIT (pScreen, &pDamage->pendingDamage);
xfree (pDamage);
free(pDamage);
}
Bool