summaryrefslogtreecommitdiff
path: root/dix/registry.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 /dix/registry.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 'dix/registry.c')
-rw-r--r--dix/registry.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/dix/registry.c b/dix/registry.c
index 1381a3dcd..fc35dbbc7 100644
--- a/dix/registry.c
+++ b/dix/registry.c
@@ -61,7 +61,7 @@ static int double_size(void *p, unsigned n, unsigned size)
n = f = BASE_SIZE * size;
}
- *ptr = xrealloc(*ptr, n);
+ *ptr = realloc(*ptr, n);
if (!*ptr) {
dixResetRegistry();
return FALSE;
@@ -285,20 +285,20 @@ dixResetRegistry(void)
while (nmajor--) {
while (nminor[nmajor])
free(requests[nmajor][--nminor[nmajor]]);
- xfree(requests[nmajor]);
+ free(requests[nmajor]);
}
- xfree(requests);
- xfree(nminor);
+ free(requests);
+ free(nminor);
while (nevent--)
free(events[nevent]);
- xfree(events);
+ free(events);
while (nerror--)
free(errors[nerror]);
- xfree(errors);
+ free(errors);
- xfree(resources);
+ free(resources);
requests = NULL;
nminor = NULL;