diff options
Diffstat (limited to 'nx-X11/programs/Xserver/Xext/saver.c')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/saver.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/Xext/saver.c b/nx-X11/programs/Xserver/Xext/saver.c index 81f502189..f9a86899f 100644 --- a/nx-X11/programs/Xserver/Xext/saver.c +++ b/nx-X11/programs/Xserver/Xext/saver.c @@ -218,7 +218,7 @@ static int ScreenPrivateIndex; #define SetScreenPrivate(s,v) ((s)->devPrivates[ScreenPrivateIndex].ptr = (void *) v); #define SetupScreen(s) ScreenSaverScreenPrivatePtr pPriv = (s ? GetScreenPrivate(s) : NULL) -#define New(t) ((t *) xalloc (sizeof (t))) +#define New(t) ((t *) malloc (sizeof (t))) /**************** * ScreenSaverExtensionInit @@ -274,7 +274,7 @@ CheckScreenPrivate (pScreen) if (!pPriv->attr && !pPriv->events && !pPriv->hasWindow && pPriv->installedMap == None) { - xfree (pPriv); + free (pPriv); SetScreenPrivate (pScreen, NULL); savedScreenInfo[pScreen->myNum].ExternalScreenSaver = NULL; } @@ -340,7 +340,7 @@ setEventMask (pScreen, client, mask) { FreeResource (pEv->resource, EventType); *pPrev = pEv->next; - xfree (pEv); + free (pEv); CheckScreenPrivate (pScreen); } else @@ -386,8 +386,8 @@ FreeScreenAttr (pAttr) ScreenSaverAttrPtr pAttr; { FreeAttrs (pAttr); - xfree (pAttr->values); - xfree (pAttr); + free (pAttr->values); + free (pAttr); } static int @@ -408,7 +408,7 @@ ScreenSaverFreeEvents (value, id) if (!pEv) return TRUE; *pPrev = pEv->next; - xfree (pEv); + free (pEv); CheckScreenPrivate (pScreen); return TRUE; } @@ -939,7 +939,7 @@ ScreenSaverSetAttributes (ClientPtr client) goto bail; } /* over allocate for override redirect */ - values = (unsigned long *) xalloc ((len + 1) * sizeof (unsigned long)); + values = (unsigned long *) malloc ((len + 1) * sizeof (unsigned long)); if (!values) { ret = BadAlloc; @@ -1172,8 +1172,8 @@ PatchUp: FreeAttrs (pAttr); bail: CheckScreenPrivate (pScreen); - if (pAttr) xfree (pAttr->values); - xfree (pAttr); + if (pAttr) free (pAttr->values); + free (pAttr); return ret; } |