diff options
author | Mikhail Gusarov <dottedmag@dottedmag.net> | 2010-05-06 01:44:06 +0700 |
---|---|---|
committer | Mikhail Gusarov <dottedmag@dottedmag.net> | 2010-05-13 00:22:37 +0700 |
commit | 3f3ff971ecff9936cebafc813af9193b97bba89c (patch) | |
tree | fdbbad794a42488b7ffe41eed7aba4e498335f55 /Xi/xiquerydevice.c | |
parent | 96c7ab27c383ec767f62a7a11e5fd76f86363fbc (diff) |
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>
Diffstat (limited to 'Xi/xiquerydevice.c')
-rw-r--r-- | Xi/xiquerydevice.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Xi/xiquerydevice.c b/Xi/xiquerydevice.c index 47ab688fd..303c8b27d 100644 --- a/Xi/xiquerydevice.c +++ b/Xi/xiquerydevice.c @@ -87,7 +87,7 @@ ProcXIQueryDevice(ClientPtr client) } else { - skip = xcalloc(sizeof(Bool), inputInfo.numDevices); + skip = calloc(sizeof(Bool), inputInfo.numDevices); if (!skip) return BadAlloc; @@ -106,7 +106,7 @@ ProcXIQueryDevice(ClientPtr client) } } - info = xcalloc(1, len); + info = calloc(1, len); if (!info) return BadAlloc; @@ -155,8 +155,8 @@ ProcXIQueryDevice(ClientPtr client) WriteReplyToClient(client, sizeof(xXIQueryDeviceReply), &rep); WriteToClient(client, rep.length * 4, ptr); - xfree(ptr); - xfree(skip); + free(ptr); + free(skip); return rc; } |