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>

2 files changed, 11 insertions, 11 deletions

diff --git a/test/xi2/protocol-common.c b/test/xi2/protocol-common.c
index 0afa55a40..d0e93f2dd 100644
--- a/test/xi2/protocol-common.c
+++ b/test/xi2/protocol-common.c
@@ -47,7 +47,7 @@ static void fake_init_sprite(DeviceIntPtr dev)
     sprite = dev->spriteInfo->sprite;
 
     sprite->spriteTraceSize = 10;
-    sprite->spriteTrace = xcalloc(sprite->spriteTraceSize, sizeof(WindowPtr));
+    sprite->spriteTrace = calloc(sprite->spriteTraceSize, sizeof(WindowPtr));
     sprite->spriteTraceGood = 1;
     sprite->spriteTrace[0] = &root;
     sprite->hot.x = SPRITE_X;
@@ -132,7 +132,7 @@ void init_window(WindowPtr window, WindowPtr parent, int id)
         window->drawable.height = 200;
     }
     window->parent = parent;
-    window->optional = xcalloc(1, sizeof(WindowOptRec));
+    window->optional = calloc(1, sizeof(WindowOptRec));
     g_assert(window->optional);
 }
 
diff --git a/test/xi2/protocol-eventconvert.c b/test/xi2/protocol-eventconvert.c
index f20a10a57..211cce6ad 100644
--- a/test/xi2/protocol-eventconvert.c
+++ b/test/xi2/protocol-eventconvert.c
@@ -141,12 +141,12 @@ static void test_XIRawEvent(RawDeviceEvent *in)
 
     test_values_XIRawEvent(in, out, FALSE);
 
-    swapped = xcalloc(1, sizeof(xEvent) + out->length * 4);
+    swapped = calloc(1, sizeof(xEvent) + out->length * 4);
     XI2EventSwap((xGenericEvent*)out, (xGenericEvent*)swapped);
     test_values_XIRawEvent(in, swapped, TRUE);
 
-    xfree(out);
-    xfree(swapped);
+    free(out);
+    free(swapped);
 }
 
 static void test_convert_XIFocusEvent(void)
@@ -400,12 +400,12 @@ static void test_XIDeviceEvent(DeviceEvent *in)
 
     test_values_XIDeviceEvent(in, out, FALSE);
 
-    swapped = xcalloc(1, sizeof(xEvent) + out->length * 4);
+    swapped = calloc(1, sizeof(xEvent) + out->length * 4);
     XI2EventSwap((xGenericEvent*)out, (xGenericEvent*)swapped);
     test_values_XIDeviceEvent(in, swapped, TRUE);
 
-    xfree(out);
-    xfree(swapped);
+    free(out);
+    free(swapped);
 }
 
 static void test_convert_XIDeviceEvent(void)
@@ -756,12 +756,12 @@ static void test_XIDeviceChangedEvent(DeviceChangedEvent *in)
 
     test_values_XIDeviceChangedEvent(in, out, FALSE);
 
-    swapped = xcalloc(1, sizeof(xEvent) + out->length * 4);
+    swapped = calloc(1, sizeof(xEvent) + out->length * 4);
     XI2EventSwap((xGenericEvent*)out, (xGenericEvent*)swapped);
     test_values_XIDeviceChangedEvent(in, swapped, TRUE);
 
-    xfree(out);
-    xfree(swapped);
+    free(out);
+    free(swapped);
 }
 
 static void test_convert_XIDeviceChangedEvent(void)