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:
@@ -128,12 +128,12 @@ exaUnrealizeGlyphCaches(ScreenPtr pScreen,
|
||||
}
|
||||
|
||||
if (cache->hashEntries) {
|
||||
xfree(cache->hashEntries);
|
||||
free(cache->hashEntries);
|
||||
cache->hashEntries = NULL;
|
||||
}
|
||||
|
||||
if (cache->glyphs) {
|
||||
xfree(cache->glyphs);
|
||||
free(cache->glyphs);
|
||||
cache->glyphs = NULL;
|
||||
}
|
||||
cache->glyphCount = 0;
|
||||
@@ -213,8 +213,8 @@ exaRealizeGlyphCaches(ScreenPtr pScreen,
|
||||
|
||||
cache->picture = pPicture;
|
||||
cache->picture->refcnt++;
|
||||
cache->hashEntries = xalloc(sizeof(int) * cache->hashSize);
|
||||
cache->glyphs = xalloc(sizeof(ExaCachedGlyphRec) * cache->size);
|
||||
cache->hashEntries = malloc(sizeof(int) * cache->hashSize);
|
||||
cache->glyphs = malloc(sizeof(ExaCachedGlyphRec) * cache->size);
|
||||
cache->glyphCount = 0;
|
||||
|
||||
if (!cache->hashEntries || !cache->glyphs)
|
||||
|
||||
Reference in New Issue
Block a user