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, 6 insertions, 6 deletions

diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c
index 346e99490..2bbcb9cb1 100644
--- a/hw/xfree86/ramdac/xf86Cursor.c
+++ b/hw/xfree86/ramdac/xf86Cursor.c
@@ -65,7 +65,7 @@ xf86InitCursor(
     if (!xf86InitHardwareCursor(pScreen, infoPtr))
 	return FALSE;
 
-    ScreenPriv = xcalloc(1, sizeof(xf86CursorScreenRec));
+    ScreenPriv = calloc(1, sizeof(xf86CursorScreenRec));
     if (!ScreenPriv)
 	return FALSE;
 
@@ -144,8 +144,8 @@ xf86CursorCloseScreen(int i, ScreenPtr pScreen)
     pScrn->EnableDisableFBAccess = ScreenPriv->EnableDisableFBAccess;
     pScrn->SwitchMode = ScreenPriv->SwitchMode;
 
-    xfree(ScreenPriv->transparentData);
-    xfree(ScreenPriv);
+    free(ScreenPriv->transparentData);
+    free(ScreenPriv);
 
     return (*pScreen->CloseScreen)(i, pScreen);
 }
@@ -286,7 +286,7 @@ xf86CursorUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
 	&pScreen->devPrivates, xf86CursorScreenKey);
 
     if (pCurs->refcnt <= 1) {
-	xfree(dixLookupPrivate(&pCurs->devPrivates, CursorScreenKey(pScreen)));
+	free(dixLookupPrivate(&pCurs->devPrivates, CursorScreenKey(pScreen)));
 	dixSetPrivate(&pCurs->devPrivates, CursorScreenKey(pScreen), NULL);
     }
 
@@ -439,13 +439,13 @@ xf86ForceHWCursor (ScreenPtr pScreen, Bool on)
 xf86CursorInfoPtr
 xf86CreateCursorInfoRec(void)
 {
-    return xcalloc(1, sizeof(xf86CursorInfoRec));
+    return calloc(1, sizeof(xf86CursorInfoRec));
 }
 
 void
 xf86DestroyCursorInfoRec(xf86CursorInfoPtr infoPtr)
 {
-    xfree(infoPtr);
+    free(infoPtr);
 }
 
 /**