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>

1 files changed, 4 insertions, 4 deletions

diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
index 765bd0ea7..9d1b38376 100644
--- a/hw/kdrive/src/kdrive.c
+++ b/hw/kdrive/src/kdrive.c
@@ -207,7 +207,7 @@ KdDoSwitchCmd (char *reason)
 {
     if (kdSwitchCmd)
     {
-	char    *command = xalloc (strlen (kdSwitchCmd) +
+	char    *command = malloc(strlen (kdSwitchCmd) +
 				   1 +
 				   strlen (reason) +
 				   1);
@@ -217,7 +217,7 @@ KdDoSwitchCmd (char *reason)
 	strcat (command, " ");
 	strcat (command, reason);
 	system (command);
-	xfree (command);
+	free(command);
     }
 }
 
@@ -699,7 +699,7 @@ KdAllocatePrivates (ScreenPtr pScreen)
     if (kdGeneration != serverGeneration)
 	kdGeneration = serverGeneration;
 
-    pScreenPriv = xcalloc(1, sizeof (*pScreenPriv));
+    pScreenPriv = calloc(1, sizeof (*pScreenPriv));
     if (!pScreenPriv)
 	return FALSE;
     KdSetScreenPriv (pScreen, pScreenPriv);
@@ -788,7 +788,7 @@ KdCloseScreen (int index, ScreenPtr pScreen)
 
     pScreenPriv->screen->pScreen = 0;
 
-    xfree ((pointer) pScreenPriv);
+    free((pointer) pScreenPriv);
     return ret;
 }