1 files changed, 22 insertions, 22 deletions

diff --git a/xorg-server/xfixes/cursor.c b/xorg-server/xfixes/cursor.c
index a44356fe9..0d7213a48 100644
--- a/xorg-server/xfixes/cursor.c
+++ b/xorg-server/xfixes/cursor.c
@@ -198,7 +198,7 @@ CursorCloseScreen (int index, ScreenPtr pScreen)
     Unwrap (cs, pScreen, DisplayCursor, display_proc);

     deleteCursorHideCountsForScreen(pScreen);

     ret = (*pScreen->CloseScreen) (index, pScreen);

-    xfree (cs);

+    free(cs);

     return ret;

 }

 

@@ -231,7 +231,7 @@ XFixesSelectCursorInput (ClientPtr	pClient,
     }

     if (!e)

     {

-	e = (CursorEventPtr) xalloc (sizeof (CursorEventRec));

+	e = (CursorEventPtr) malloc(sizeof (CursorEventRec));

 	if (!e)

 	    return BadAlloc;

 

@@ -251,7 +251,7 @@ XFixesSelectCursorInput (ClientPtr	pClient,
 	    if (!AddResource (pWindow->drawable.id, CursorWindowType,

 			      (pointer) pWindow))

 	    {

-		xfree (e);

+		free(e);

 		return BadAlloc;

 	    }

 

@@ -391,7 +391,7 @@ ProcXFixesGetCursorImage (ClientPtr client)
     width = pCursor->bits->width;

     height = pCursor->bits->height;

     npixels = width * height;

-    rep = xalloc (sizeof (xXFixesGetCursorImageReply) +

+    rep = malloc(sizeof (xXFixesGetCursorImageReply) +

 		  npixels * sizeof (CARD32));

     if (!rep)

 	return BadAlloc;

@@ -425,8 +425,8 @@ ProcXFixesGetCursorImage (ClientPtr client)
     }

     WriteToClient(client, sizeof (xXFixesGetCursorImageReply) +

 			 (npixels << 2), (char *) rep);

-    xfree (rep);

-    return client->noClientException;

+    free(rep);

+    return Success;

 }

 

 int

@@ -454,7 +454,7 @@ ProcXFixesSetCursorName (ClientPtr client)
 	return BadAlloc;

     

     pCursor->name = atom;

-    return(client->noClientException);

+    return Success;

 }

 

 int

@@ -503,7 +503,7 @@ ProcXFixesGetCursorName (ClientPtr client)
     WriteReplyToClient(client, sizeof(xXFixesGetCursorNameReply), &reply);

     WriteToClient(client, len, str);

     

-    return(client->noClientException);

+    return Success;

 }

 

 int

@@ -546,7 +546,7 @@ ProcXFixesGetCursorImageAndName (ClientPtr client)
     name = pCursor->name ? NameForAtom (pCursor->name) : "";

     nbytes = strlen (name);

     nbytesRound = pad_to_int32(nbytes);

-    rep = xalloc (sizeof (xXFixesGetCursorImageAndNameReply) +

+    rep = malloc(sizeof (xXFixesGetCursorImageAndNameReply) +

 		  npixels * sizeof (CARD32) + nbytesRound);

     if (!rep)

 	return BadAlloc;

@@ -585,8 +585,8 @@ ProcXFixesGetCursorImageAndName (ClientPtr client)
     }

     WriteToClient(client, sizeof (xXFixesGetCursorImageAndNameReply) +

 			 (npixels << 2) + nbytesRound, (char *) rep);

-    xfree (rep);

-    return client->noClientException;

+    free(rep);

+    return Success;

 }

 

 int

@@ -721,7 +721,7 @@ ProcXFixesChangeCursor (ClientPtr client)
 		   DixWriteAccess|DixSetAttrAccess);

 

     ReplaceCursor (pSource, TestForCursor, (pointer) pDestination);

-    return (client->noClientException);

+    return Success;

 }

 

 int

@@ -759,7 +759,7 @@ ProcXFixesChangeCursorByName (ClientPtr client)
     name = MakeAtom (tchar, stuff->nbytes, FALSE);

     if (name)

 	ReplaceCursor (pSource, TestForCursorName, &name);

-    return (client->noClientException);

+    return Success;

 }

 

 int

@@ -803,7 +803,7 @@ createCursorHideCount (ClientPtr pClient, ScreenPtr pScreen)
     CursorScreenPtr    cs = GetCursorScreen(pScreen);

     CursorHideCountPtr pChc;

 

-    pChc = (CursorHideCountPtr) xalloc(sizeof(CursorHideCountRec));

+    pChc = (CursorHideCountPtr) malloc(sizeof(CursorHideCountRec));

     if (pChc == NULL) {

 	return BadAlloc;

     }

@@ -820,7 +820,7 @@ createCursorHideCount (ClientPtr pClient, ScreenPtr pScreen)
      */

     if (!AddResource (pChc->resource, CursorHideCountType, 

 		      (pointer) pChc)) {

-	xfree(pChc);

+	free(pChc);

 	return BadAlloc;

     }

 

@@ -841,7 +841,7 @@ deleteCursorHideCount (CursorHideCountPtr pChcToDel, ScreenPtr pScreen)
     while (pChc != NULL) {

 	pNext = pChc->pNext;

 	if (pChc == pChcToDel) {

-	    xfree(pChc);

+	    free(pChc);

 	    if (pChcLast == NULL) {

 		cs->pCursorHideCounts = pNext;

 	    } else {

@@ -897,7 +897,7 @@ ProcXFixesHideCursor (ClientPtr client)
     pChc = findCursorHideCount(client, pWin->drawable.pScreen);

     if (pChc != NULL) {

 	pChc->hideCount++;

-	return client->noClientException;

+	return Success;

     }

 

     /* 

@@ -971,7 +971,7 @@ ProcXFixesShowCursor (ClientPtr client)
 	FreeResource(pChc->resource, 0);

     }

 

-    return (client->noClientException);

+    return Success;

 }

 

 int 

@@ -997,7 +997,7 @@ CursorFreeClient (pointer data, XID id)
 	if (e == old)

 	{

 	    *prev = e->next;

-	    xfree (e);

+	    free(e);

 	    break;

 	}

     }

@@ -1045,8 +1045,8 @@ createInvisibleCursor (void)
     unsigned char *psrcbits, *pmaskbits;

     CursorMetricRec cm;

 

-    psrcbits = (unsigned char *) xcalloc(4, 1);

-    pmaskbits = (unsigned char *) xcalloc(4, 1);

+    psrcbits = (unsigned char *) calloc(4, 1);

+    pmaskbits = (unsigned char *) calloc(4, 1);

     if (psrcbits == NULL || pmaskbits == NULL) {

 	return NULL;

     }

@@ -1082,7 +1082,7 @@ XFixesCursorInit (void)
 	ScreenPtr	pScreen = screenInfo.screens[i];

 	CursorScreenPtr	cs;

 

-	cs = (CursorScreenPtr) xalloc (sizeof (CursorScreenRec));

+	cs = (CursorScreenPtr) malloc(sizeof (CursorScreenRec));

 	if (!cs)

 	    return FALSE;

 	Wrap (cs, pScreen, CloseScreen, CursorCloseScreen);