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:
@@ -173,7 +173,7 @@ ProcXISelectEvents(ClientPtr client)
|
||||
|
||||
RecalculateDeliverableEvents(win);
|
||||
|
||||
xfree(types);
|
||||
free(types);
|
||||
return Success;
|
||||
}
|
||||
|
||||
@@ -234,7 +234,7 @@ ProcXIGetSelectedEvents(ClientPtr client)
|
||||
return Success;
|
||||
}
|
||||
|
||||
buffer = xcalloc(MAXDEVICES, sizeof(xXIEventMask) + pad_to_int32(XI2MASKSIZE));
|
||||
buffer = calloc(MAXDEVICES, sizeof(xXIEventMask) + pad_to_int32(XI2MASKSIZE));
|
||||
if (!buffer)
|
||||
return BadAlloc;
|
||||
|
||||
@@ -281,7 +281,7 @@ ProcXIGetSelectedEvents(ClientPtr client)
|
||||
if (reply.num_masks)
|
||||
WriteToClient(client, reply.length * 4, buffer);
|
||||
|
||||
xfree(buffer);
|
||||
free(buffer);
|
||||
return Success;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user