summaryrefslogtreecommitdiff
path: root/Xi/xiselectev.c
diff options
context:
space:
mode:
authorMikhail Gusarov <dottedmag@dottedmag.net>2010-05-06 01:44:06 +0700
committerMikhail Gusarov <dottedmag@dottedmag.net>2010-05-13 00:22:37 +0700
commit3f3ff971ecff9936cebafc813af9193b97bba89c (patch)
treefdbbad794a42488b7ffe41eed7aba4e498335f55 /Xi/xiselectev.c
parent96c7ab27c383ec767f62a7a11e5fd76f86363fbc (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/xiselectev.c')
-rw-r--r--Xi/xiselectev.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Xi/xiselectev.c b/Xi/xiselectev.c
index 672edab3b..7aa3f0ab6 100644
--- a/Xi/xiselectev.c
+++ b/Xi/xiselectev.c
@@ -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;
}