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

1 files changed, 17 insertions, 17 deletions

diff --git a/xorg-server/Xext/saver.c b/xorg-server/Xext/saver.c
index 3c541a6ce..5cf426d61 100644
--- a/xorg-server/Xext/saver.c
+++ b/xorg-server/Xext/saver.c
@@ -241,7 +241,7 @@ static DevPrivateKey ScreenPrivateKey = &ScreenPrivateKeyIndex;
     dixSetPrivate(&(s)->devPrivates, ScreenPrivateKey, v);

 #define SetupScreen(s)	ScreenSaverScreenPrivatePtr pPriv = (s ? GetScreenPrivate(s) : NULL)

 

-#define New(t)	(xalloc (sizeof (t)))

+#define New(t)	(malloc(sizeof (t)))

 

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

  * ScreenSaverExtensionInit

@@ -289,7 +289,7 @@ CheckScreenPrivate (ScreenPtr pScreen)
     if (!pPriv->attr && !pPriv->events &&

 	!pPriv->hasWindow && pPriv->installedMap == None)

     {

-	xfree (pPriv);

+	free(pPriv);

 	SetScreenPrivate (pScreen, NULL);

 	savedScreenInfo[pScreen->myNum].ExternalScreenSaver = NULL;

     }

@@ -349,7 +349,7 @@ setEventMask (ScreenPtr pScreen, ClientPtr client, unsigned long mask)
     {

 	FreeResource (pEv->resource, SaverEventType);

 	*pPrev = pEv->next;

-	xfree (pEv);

+	free(pEv);

 	CheckScreenPrivate (pScreen);

     }

     else

@@ -393,8 +393,8 @@ static void
 FreeScreenAttr (ScreenSaverAttrPtr pAttr)

 {

     FreeAttrs (pAttr);

-    xfree (pAttr->values);

-    xfree (pAttr);

+    free(pAttr->values);

+    free(pAttr);

 }

 

 static int

@@ -413,7 +413,7 @@ ScreenSaverFreeEvents (pointer value, XID id)
     if (!pEv)

 	return TRUE;

     *pPrev = pEv->next;

-    xfree (pEv);

+    free(pEv);

     CheckScreenPrivate (pScreen);

     return TRUE;

 }

@@ -452,7 +452,7 @@ ScreenSaverFreeSuspend (pointer value, XID id)
 	if (this == data)

 	{

 	    *prev = this->next;

-	    xfree (this);

+	    free(this);

 	    break;

 	}

     }

@@ -650,14 +650,14 @@ CreateSaverWindow (ScreenPtr pScreen)
     wantMap = wColormap (pWin);

     if (wantMap == None)

 	return TRUE;

-    installedMaps = xalloc (pScreen->maxInstalledCmaps * sizeof (Colormap));

+    installedMaps = malloc(pScreen->maxInstalledCmaps * sizeof (Colormap));

     numInstalled = (*pWin->drawable.pScreen->ListInstalledColormaps)

 						    (pScreen, installedMaps);

     for (i = 0; i < numInstalled; i++) 

 	if (installedMaps[i] == wantMap)

 	    break;

 

-    xfree ((char *) installedMaps);

+    free((char *) installedMaps);

 

     if (i < numInstalled)

 	return TRUE;

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

     }

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

-    return (client->noClientException);

+    return Success;

 }

 

 static int

@@ -819,7 +819,7 @@ ProcScreenSaverQueryInfo (ClientPtr client)
 	swapl (&rep.eventMask, n);

     }

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

-    return (client->noClientException);

+    return Success;

 }

 

 static int

@@ -988,7 +988,7 @@ ScreenSaverSetAttributes (ClientPtr client)
 	goto bail;

     }

     /* over allocate for override redirect */

-    values = xalloc ((len + 1) * sizeof (unsigned long));

+    values = malloc((len + 1) * sizeof (unsigned long));

     if (!values)

     {

 	ret = BadAlloc;

@@ -1225,8 +1225,8 @@ PatchUp:
     FreeAttrs (pAttr);

 bail:

     CheckScreenPrivate (pScreen);

-    if (pAttr) xfree (pAttr->values);

-    xfree (pAttr);

+    if (pAttr) free(pAttr->values);

+    free(pAttr);

     return ret;

 }

 

@@ -1398,7 +1398,7 @@ ProcScreenSaverSuspend (ClientPtr client)
      * to the record, so the screensaver will be reenabled and the record freed

      * if the client disconnects without reenabling it first.

      */

-    this = xalloc (sizeof (ScreenSaverSuspensionRec));

+    this = malloc(sizeof (ScreenSaverSuspensionRec));

 

     if (!this)

 	return BadAlloc;

@@ -1410,7 +1410,7 @@ ProcScreenSaverSuspend (ClientPtr client)
 

     if (!AddResource (this->clientResource, SuspendType, (pointer) this))

     {

-	xfree (this);

+	free(this);

 	return BadAlloc;

     }

 

@@ -1421,7 +1421,7 @@ ProcScreenSaverSuspend (ClientPtr client)
 	FreeScreenSaverTimer();

     }

 

-    return (client->noClientException);

+    return Success;

 }

 

 static DISPATCH_PROC((*NormalVector[])) = {