svn merge -r588:HEAD ^/branches/released .

1 files changed, 13 insertions, 13 deletions

diff --git a/xorg-server/Xext/shape.c b/xorg-server/Xext/shape.c
index 3a7dad5d7..32b320b0e 100644
--- a/xorg-server/Xext/shape.c
+++ b/xorg-server/Xext/shape.c
@@ -271,7 +271,7 @@ ProcShapeQueryVersion (ClientPtr client)
 	swaps(&rep.minorVersion, n);

     }

     WriteToClient(client, sizeof (xShapeQueryVersionReply), (char *)&rep);

-    return (client->noClientException);

+    return Success;

 }

 

 /*****************

@@ -738,7 +738,7 @@ ProcShapeQueryExtents (ClientPtr client)
 	swaps(&rep.heightClipShape, n);

     }

     WriteToClient(client, sizeof (xShapeQueryExtentsReply), (char *)&rep);

-    return (client->noClientException);

+    return Success;

 }

 

 /*ARGSUSED*/

@@ -766,7 +766,7 @@ ShapeFreeClient (pointer data, XID id)
 	    	*pHead = pShapeEvent->next;

 	}

     }

-    xfree ((pointer) pShapeEvent);

+    free((pointer) pShapeEvent);

     return 1;

 }

 

@@ -780,9 +780,9 @@ ShapeFreeEvents (pointer data, XID id)
     for (pCur = *pHead; pCur; pCur = pNext) {

 	pNext = pCur->next;

 	FreeResource (pCur->clientResource, ClientType);

-	xfree ((pointer) pCur);

+	free((pointer) pCur);

     }

-    xfree ((pointer) pHead);

+    free((pointer) pHead);

     return 1;

 }

 

@@ -819,7 +819,7 @@ ProcShapeSelectInput (ClientPtr client)
 	}

 

 	/* build the entry */

-    	pNewShapeEvent = xalloc (sizeof (ShapeEventRec));

+	pNewShapeEvent = malloc(sizeof (ShapeEventRec));

     	if (!pNewShapeEvent)

 	    return BadAlloc;

     	pNewShapeEvent->next = 0;

@@ -841,7 +841,7 @@ ProcShapeSelectInput (ClientPtr client)
      	 */

     	if (!pHead)

     	{

-	    pHead = xalloc (sizeof (ShapeEventPtr));

+	    pHead = malloc(sizeof (ShapeEventPtr));

 	    if (!pHead ||

 		!AddResource (pWin->drawable.id, ShapeEventType, (pointer)pHead))

 	    {

@@ -868,7 +868,7 @@ ProcShapeSelectInput (ClientPtr client)
 		    pNewShapeEvent->next = pShapeEvent->next;

 		else

 		    *pHead = pShapeEvent->next;

-		xfree (pShapeEvent);

+		free(pShapeEvent);

 	    }

 	}

 	break;

@@ -998,7 +998,7 @@ ProcShapeInputSelected (ClientPtr client)
 	swapl (&rep.length, n);

     }

     WriteToClient (client, sizeof (xShapeInputSelectedReply), (char *) &rep);

-    return (client->noClientException);

+    return Success;

 }

 

 static int

@@ -1032,7 +1032,7 @@ ProcShapeGetRectangles (ClientPtr client)
     }

     if (!region) {

 	nrects = 1;

-	rects = xalloc (sizeof (xRectangle));

+	rects = malloc(sizeof (xRectangle));

 	if (!rects)

 	    return BadAlloc;

 	switch (stuff->kind) {

@@ -1059,7 +1059,7 @@ ProcShapeGetRectangles (ClientPtr client)
 	BoxPtr box;

 	nrects = REGION_NUM_RECTS(region);

 	box = REGION_RECTS(region);

-	rects = xalloc (nrects * sizeof (xRectangle));

+	rects = malloc(nrects * sizeof (xRectangle));

 	if (!rects && nrects)

 	    return BadAlloc;

 	for (i = 0; i < nrects; i++, box++) {

@@ -1082,8 +1082,8 @@ ProcShapeGetRectangles (ClientPtr client)
     }

     WriteToClient (client, sizeof (rep), (char *) &rep);

     WriteToClient (client, nrects * sizeof (xRectangle), (char *) rects);

-    xfree (rects);

-    return client->noClientException;

+    free(rects);

+    return Success;

 }

 

 static int