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:
@@ -47,7 +47,7 @@ static void fake_init_sprite(DeviceIntPtr dev)
|
||||
sprite = dev->spriteInfo->sprite;
|
||||
|
||||
sprite->spriteTraceSize = 10;
|
||||
sprite->spriteTrace = xcalloc(sprite->spriteTraceSize, sizeof(WindowPtr));
|
||||
sprite->spriteTrace = calloc(sprite->spriteTraceSize, sizeof(WindowPtr));
|
||||
sprite->spriteTraceGood = 1;
|
||||
sprite->spriteTrace[0] = &root;
|
||||
sprite->hot.x = SPRITE_X;
|
||||
@@ -132,7 +132,7 @@ void init_window(WindowPtr window, WindowPtr parent, int id)
|
||||
window->drawable.height = 200;
|
||||
}
|
||||
window->parent = parent;
|
||||
window->optional = xcalloc(1, sizeof(WindowOptRec));
|
||||
window->optional = calloc(1, sizeof(WindowOptRec));
|
||||
g_assert(window->optional);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user