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:
@@ -91,7 +91,7 @@ ServerBitsFromGlyph(FontPtr pfont, unsigned ch, CursorMetricPtr cm, unsigned cha
|
||||
|
||||
pScreen = screenInfo.screens[0];
|
||||
nby = BitmapBytePad(cm->width) * (long)cm->height;
|
||||
pbits = xcalloc(1, nby);
|
||||
pbits = calloc(1, nby);
|
||||
if (!pbits)
|
||||
return BadAlloc;
|
||||
|
||||
@@ -105,7 +105,7 @@ ServerBitsFromGlyph(FontPtr pfont, unsigned ch, CursorMetricPtr cm, unsigned cha
|
||||
(*pScreen->DestroyPixmap)(ppix);
|
||||
if (pGC)
|
||||
FreeScratchGC(pGC);
|
||||
xfree(pbits);
|
||||
free(pbits);
|
||||
return BadAlloc;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user