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:
@@ -144,7 +144,7 @@ ProcXIQueryPointer(ClientPtr client)
|
||||
rep.buttons_len = bytes_to_int32(bits_to_bytes(pDev->button->numButtons));
|
||||
rep.length += rep.buttons_len;
|
||||
buttons_size = rep.buttons_len * 4;
|
||||
buttons = xcalloc(1, buttons_size);
|
||||
buttons = calloc(1, buttons_size);
|
||||
if (!buttons)
|
||||
return BadAlloc;
|
||||
|
||||
@@ -195,7 +195,7 @@ ProcXIQueryPointer(ClientPtr client)
|
||||
if (buttons)
|
||||
WriteToClient(client, buttons_size, buttons);
|
||||
|
||||
xfree(buttons);
|
||||
free(buttons);
|
||||
|
||||
return Success;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user