diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-26 01:38:22 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-02 14:05:30 +0200 |
| commit | acf87144d019f18e646501657d9082c6eba77f54 (patch) | |
| tree | dadb838cd54010836230358a4a5805bb0696b5bb /nx-X11/programs/Xserver | |
| parent | 279d37127db241a9ee685f6b671f51aa21a972ea (diff) | |
| download | nx-libs-acf87144d019f18e646501657d9082c6eba77f54.tar.gz nx-libs-acf87144d019f18e646501657d9082c6eba77f54.tar.bz2 nx-libs-acf87144d019f18e646501657d9082c6eba77f54.zip | |
nx-X11/programs/Xserver: Drop {X,x}free() macros, use free() instead.
Fixes ArcticaProject/nx-libs#105
Diffstat (limited to 'nx-X11/programs/Xserver')
139 files changed, 889 insertions, 890 deletions
diff --git a/nx-X11/programs/Xserver/GL/glx/glximports.c b/nx-X11/programs/Xserver/GL/glx/glximports.c index 435caca58..5b6c545fc 100644 --- a/nx-X11/programs/Xserver/GL/glx/glximports.c +++ b/nx-X11/programs/Xserver/GL/glx/glximports.c @@ -81,7 +81,7 @@ void *__glXImpCalloc(__GLcontext *gc, size_t numElements, size_t elementSize) void __glXImpFree(__GLcontext *gc, void *addr) { if (addr) { - xfree(addr); + free(addr); } } @@ -91,7 +91,7 @@ void *__glXImpRealloc(__GLcontext *gc, void *addr, size_t newSize) if (addr) { if (newSize == 0) { - xfree(addr); + free(addr); return NULL; } newAddr = xrealloc(addr, newSize); diff --git a/nx-X11/programs/Xserver/GL/glx/glxscreens.c b/nx-X11/programs/Xserver/GL/glx/glxscreens.c index 58b38b1a2..1cbc0baf7 100644 --- a/nx-X11/programs/Xserver/GL/glx/glxscreens.c +++ b/nx-X11/programs/Xserver/GL/glx/glxscreens.c @@ -366,9 +366,9 @@ void __glXScreenReset(void) __glXFree(__glXActiveScreens[i].GLXextensions); __glXFree(__glXActiveScreens[i].GLextensions); } - xfree(__glXActiveScreens); - xfree(__glXHyperpipeFuncs); - xfree(__glXSwapBarrierFuncs); + free(__glXActiveScreens); + free(__glXHyperpipeFuncs); + free(__glXSwapBarrierFuncs); __glXNumHyperpipeFuncs = 0; __glXNumSwapBarrierFuncs = 0; __glXHyperpipeFuncs = NULL; diff --git a/nx-X11/programs/Xserver/GL/glx/glxutil.c b/nx-X11/programs/Xserver/GL/glx/glxutil.c index 03bc19f63..cf0aae011 100644 --- a/nx-X11/programs/Xserver/GL/glx/glxutil.c +++ b/nx-X11/programs/Xserver/GL/glx/glxutil.c @@ -102,7 +102,7 @@ __glXRealloc(void *addr, size_t newSize) if (addr) { if (newSize == 0) { - xfree(addr); + free(addr); return NULL; } else { newAddr = xrealloc(addr, newSize); @@ -125,7 +125,7 @@ void __glXFree(void *addr) { if (addr) { - xfree(addr); + free(addr); } } diff --git a/nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c b/nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c index 19b5be637..6ec2164ba 100644 --- a/nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c +++ b/nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c @@ -516,7 +516,7 @@ static Bool init_visuals(int *nvisualp, VisualPtr *visualp, /* Free the private list created by DDX HW driver */ if (visualPrivates) - xfree(visualPrivates); + free(visualPrivates); visualPrivates = NULL; return TRUE; diff --git a/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c b/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c index 1889bdabd..0a86bf208 100644 --- a/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c +++ b/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c @@ -70,7 +70,7 @@ void XMesaDestroyImage(XMesaImage *image) { if (image->data) free(image->data); - xfree(image); + free(image); } unsigned long XMesaGetPixel(XMesaImage *image, int x, int y) diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.c b/nx-X11/programs/Xserver/Xext/extmod/modinit.c index 6969148a3..5bfd15719 100644 --- a/nx-X11/programs/Xserver/Xext/extmod/modinit.c +++ b/nx-X11/programs/Xserver/Xext/extmod/modinit.c @@ -167,7 +167,7 @@ extmodSetup(void * module, void * opts, int *errmaj, int *errmin) strcpy(s, "omit"); strcat(s, extensionModules[i].name); o = xf86FindOption(opts, s); - xfree(s); + free(s); if (o) { xf86MarkOptionUsed(o); continue; diff --git a/nx-X11/programs/Xserver/Xext/panoramiX.c b/nx-X11/programs/Xserver/Xext/panoramiX.c index a1bfa91d6..c3b47cf2c 100644 --- a/nx-X11/programs/Xserver/Xext/panoramiX.c +++ b/nx-X11/programs/Xserver/Xext/panoramiX.c @@ -165,7 +165,7 @@ XineramaCloseScreen (int i, ScreenPtr pScreen) if (pScreen->myNum == 0) RegionUninit(&PanoramiXScreenRegion); - xfree ((void *) pScreenPriv); + free ((void *) pScreenPriv); return (*pScreen->CloseScreen) (i, pScreen); } @@ -337,7 +337,7 @@ XineramaDestroyClip(GCPtr pGC) int XineramaDeleteResource(void * data, XID id) { - xfree(data); + free(data); return 1; } @@ -727,10 +727,10 @@ Bool PanoramiXCreateConnectionBlock(void) connSetupPrefix.length = length >> 2; - xfree(PanoramiXVisuals); + free(PanoramiXVisuals); for (i = 0; i < PanoramiXNumDepths; i++) - xfree(PanoramiXDepths[i].vids); - xfree(PanoramiXDepths); + free(PanoramiXDepths[i].vids); + free(PanoramiXDepths); /* * OK, change some dimensions so it looks as if it were one big screen @@ -752,7 +752,7 @@ Bool PanoramiXCreateConnectionBlock(void) tmp = (void *)ConnectionCallbackList; (*ConnectionCallbackList->func)(); ConnectionCallbackList = ConnectionCallbackList->next; - xfree(tmp); + free(tmp); } return TRUE; @@ -927,7 +927,7 @@ static void PanoramiXResetProc(ExtensionEntry* extEntry) for (i = 256; i--; ) ProcVector[i] = SavedProcVector[i]; - Xfree(panoramiXdataPtr); + free(panoramiXdataPtr); } @@ -1292,7 +1292,7 @@ XineramaGetImageData( } if(ScratchMem) - xfree(ScratchMem); + free(ScratchMem); RegionUninit(&SrcRegion); RegionUninit(&GrabRegion); diff --git a/nx-X11/programs/Xserver/Xext/panoramiXprocs.c b/nx-X11/programs/Xserver/Xext/panoramiXprocs.c index b4719d76f..28c0eb8b0 100644 --- a/nx-X11/programs/Xserver/Xext/panoramiXprocs.c +++ b/nx-X11/programs/Xserver/Xext/panoramiXprocs.c @@ -170,7 +170,7 @@ int PanoramiXCreateWindow(ClientPtr client) if (result == Success) AddResource(newWin->info[0].id, XRT_WINDOW, newWin); else - xfree(newWin); + free(newWin); return (result); } @@ -679,7 +679,7 @@ int PanoramiXCreatePixmap(ClientPtr client) if (result == Success) AddResource(newPix->info[0].id, XRT_PIXMAP, newPix); else - xfree(newPix); + free(newPix); return (result); } @@ -784,7 +784,7 @@ int PanoramiXCreateGC(ClientPtr client) if (result == Success) AddResource(newGC->info[0].id, XRT_GC, newGC); else - xfree(newGC); + free(newGC); return (result); } @@ -1049,7 +1049,7 @@ int PanoramiXCopyArea(ClientPtr client) if(drawables[0]->depth != pDst->depth) { client->errorValue = stuff->dstDrawable; - xfree(data); + free(data); return (BadMatch); } @@ -1060,7 +1060,7 @@ int PanoramiXCopyArea(ClientPtr client) if(dstShared) break; } - xfree(data); + free(data); result = Success; } else { @@ -1890,7 +1890,7 @@ int PanoramiXGetImage(ClientPtr client) } } } - xfree(pBuf); + free(pBuf); return (client->noClientException); } @@ -2092,7 +2092,7 @@ int PanoramiXCreateColormap(ClientPtr client) if (result == Success) AddResource(newCmap->info[0].id, XRT_COLORMAP, newCmap); else - xfree(newCmap); + free(newCmap); return (result); } @@ -2159,7 +2159,7 @@ PanoramiXCopyColormapAndFree(ClientPtr client) if (result == Success) AddResource(newCmap->info[0].id, XRT_COLORMAP, newCmap); else - xfree(newCmap); + free(newCmap); return (result); } diff --git a/nx-X11/programs/Xserver/Xext/saver.c b/nx-X11/programs/Xserver/Xext/saver.c index 81f502189..68dbe2fe8 100644 --- a/nx-X11/programs/Xserver/Xext/saver.c +++ b/nx-X11/programs/Xserver/Xext/saver.c @@ -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; } @@ -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; } diff --git a/nx-X11/programs/Xserver/Xext/security.c b/nx-X11/programs/Xserver/Xext/security.c index 096b88d20..ceadd8f6a 100644 --- a/nx-X11/programs/Xserver/Xext/security.c +++ b/nx-X11/programs/Xserver/Xext/security.c @@ -331,7 +331,7 @@ SecurityDeleteAuthorization( } SecurityAudit("revoked authorization ID %d\n", pAuth->id); - xfree(pAuth); + free(pAuth); return Success; } /* SecurityDeleteAuthorization */ @@ -356,7 +356,7 @@ SecurityDeleteAuthorizationEventClient( prev->next = pEventClient->next; else pAuth->eventClients = pEventClient->next; - xfree(pEventClient); + free(pEventClient); return(Success); } prev = pEventClient; @@ -533,7 +533,7 @@ SecurityEventSelectForAuthorization( if (!AddResource(pEventClient->resource, RTEventClient, (void *)pAuth)) { - xfree(pEventClient); + free(pEventClient); return BadAlloc; } pAuth->eventClients = pEventClient; @@ -734,7 +734,7 @@ bailout: if (removeAuth) RemoveAuthorization(stuff->nbytesAuthProto, protoname, authdata_len, pAuthdata); - if (pAuth) xfree(pAuth); + if (pAuth) free(pAuth); return err; } /* ProcSecurityGenerateAuthorization */ @@ -1486,7 +1486,7 @@ SecurityFreePropertyAccessList(void) { PropertyAccessPtr freeit = PropertyAccessList; PropertyAccessList = PropertyAccessList->next; - xfree(freeit); + free(freeit); } } /* SecurityFreePropertyAccessList */ @@ -1650,7 +1650,7 @@ SecurityParsePropertyAccessRule( pacl->name = MakeAtom(propname, strlen(propname), TRUE); if (pacl->name == BAD_RESOURCE) { - Xfree(pacl); + free(pacl); return FALSE; } if (mustHaveProperty) @@ -1659,7 +1659,7 @@ SecurityParsePropertyAccessRule( strlen(mustHaveProperty), TRUE); if (pacl->mustHaveProperty == BAD_RESOURCE) { - Xfree(pacl); + free(pacl); return FALSE; } } @@ -1724,7 +1724,7 @@ SecurityParseSitePolicy( sizeof (char *) * (nSecurityPolicyStrings + 1)); if (!newStrings) { - Xfree(copyPolicyStr); + free(copyPolicyStr); return TRUE; } @@ -1752,9 +1752,9 @@ SecurityFreeSitePolicyStrings(void) assert(nSecurityPolicyStrings); while (nSecurityPolicyStrings--) { - Xfree(SecurityPolicyStrings[nSecurityPolicyStrings]); + free(SecurityPolicyStrings[nSecurityPolicyStrings]); } - Xfree(SecurityPolicyStrings); + free(SecurityPolicyStrings); SecurityPolicyStrings = NULL; nSecurityPolicyStrings = 0; } diff --git a/nx-X11/programs/Xserver/Xext/shape.c b/nx-X11/programs/Xserver/Xext/shape.c index b272f1bbe..a55dd4553 100644 --- a/nx-X11/programs/Xserver/Xext/shape.c +++ b/nx-X11/programs/Xserver/Xext/shape.c @@ -796,7 +796,7 @@ ShapeFreeClient (data, id) *pHead = pShapeEvent->next; } } - xfree ((void *) pShapeEvent); + free ((void *) pShapeEvent); return 1; } @@ -812,9 +812,9 @@ ShapeFreeEvents (data, id) for (pCur = *pHead; pCur; pCur = pNext) { pNext = pCur->next; FreeResource (pCur->clientResource, ClientType); - xfree ((void *) pCur); + free ((void *) pCur); } - xfree ((void *) pHead); + free ((void *) pHead); return 1; } @@ -898,7 +898,7 @@ ProcShapeSelectInput (client) pNewShapeEvent->next = pShapeEvent->next; else *pHead = pShapeEvent->next; - xfree (pShapeEvent); + free (pShapeEvent); } } break; diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c index 83d6eaaab..4e36a6bb4 100644 --- a/nx-X11/programs/Xserver/Xext/shm.c +++ b/nx-X11/programs/Xserver/Xext/shm.c @@ -447,7 +447,7 @@ ProcShmAttach(client) if ((shmdesc->addr == ((char *)-1)) || shmctl(stuff->shmid, IPC_STAT, &buf)) { - xfree(shmdesc); + free(shmdesc); return BadAccess; } @@ -457,7 +457,7 @@ ProcShmAttach(client) if (shm_access(client, &(buf.shm_perm), stuff->readOnly) == -1) { shmdt(shmdesc->addr); - xfree(shmdesc); + free(shmdesc); return BadAccess; } @@ -488,7 +488,7 @@ ShmDetachSegment(value, shmseg) for (prev = &Shmsegs; *prev != shmdesc; prev = &(*prev)->next) ; *prev = shmdesc->next; - xfree(shmdesc); + free(shmdesc); return Success; } @@ -820,7 +820,7 @@ CreatePmap: (*pScreen->DestroyPixmap)(pMap); FreeResource(newPix->info[j].id, RT_NONE); } - xfree(newPix); + free(newPix); } else AddResource(stuff->pid, XRT_PIXMAP, newPix); diff --git a/nx-X11/programs/Xserver/Xext/sleepuntil.c b/nx-X11/programs/Xserver/Xext/sleepuntil.c index 62f946cf8..368dc6b48 100644 --- a/nx-X11/programs/Xserver/Xext/sleepuntil.c +++ b/nx-X11/programs/Xserver/Xext/sleepuntil.c @@ -111,7 +111,7 @@ ClientSleepUntil (client, revive, notifyFunc, closure) SertafiedWakeupHandler, (void *) 0)) { - xfree (pRequest); + free (pRequest); return FALSE; } BlockHandlerRegistered = TRUE; @@ -169,7 +169,7 @@ SertafiedDelete (value, id) } if (pRequest->notifyFunc) (*pRequest->notifyFunc) (pRequest->pClient, pRequest->closure); - xfree (pRequest); + free (pRequest); return TRUE; } diff --git a/nx-X11/programs/Xserver/Xext/sync.c b/nx-X11/programs/Xserver/Xext/sync.c index f79cc1b23..8fe510497 100644 --- a/nx-X11/programs/Xserver/Xext/sync.c +++ b/nx-X11/programs/Xserver/Xext/sync.c @@ -319,7 +319,7 @@ SyncDeleteTriggerFromCounter(pTrigger) pPrev->next = pCur->next; else pTrigger->pCounter->pTriglist = pCur->next; - xfree(pCur); + free(pCur); break; } } @@ -890,7 +890,7 @@ SyncEventSelectForAlarm(pAlarm, client, wantevents) pClients->delete_id = FakeClientID(client->index); if (!AddResource(pClients->delete_id, RTAlarmClient, pAlarm)) { - xfree(pClients); + free(pClients); return BadAlloc; } @@ -1019,7 +1019,7 @@ SyncCreateCounter(client, id, initialvalue) if (!AddResource(id, RTCounter, (void *) pCounter)) { - xfree((void *) pCounter); + free((void *) pCounter); return (SyncCounter *)NULL; } @@ -1214,7 +1214,7 @@ FreeAlarm(addr, id) SyncDeleteTriggerFromCounter(&pAlarm->trigger); - xfree(pAlarm); + free(pAlarm); return Success; } @@ -1237,13 +1237,13 @@ FreeCounter(env, id) { (*ptl->pTrigger->CounterDestroyed)(ptl->pTrigger); pnext = ptl->next; - xfree(ptl); /* destroy the trigger list as we go */ + free(ptl); /* destroy the trigger list as we go */ } if (IsSystemCounter(pCounter)) { int i, found = 0; - xfree(pCounter->pSysCounterInfo); + free(pCounter->pSysCounterInfo); /* find the counter in the list of system counters and remove it */ @@ -1267,7 +1267,7 @@ FreeCounter(env, id) } SyncNumSystemCounters--; } - xfree(pCounter); + free(pCounter); return Success; } @@ -1298,7 +1298,7 @@ FreeAwait(addr, id) if (pCounter && !pCounter->beingDestroyed) SyncDeleteTriggerFromCounter(&pAwait->trigger); } - xfree(pAwaitUnion); + free(pAwaitUnion); return Success; } @@ -1321,7 +1321,7 @@ FreeAlarmClient(value, id) pPrev->next = pCur->next; else pAlarm->pEventClients = pCur->next; - xfree(pCur); + free(pCur); return(Success); } } @@ -1679,7 +1679,7 @@ ProcSyncAwait(client) pAwaitUnion->header.delete_id = FakeClientID(client->index); if (!AddResource(pAwaitUnion->header.delete_id, RTAwait, pAwaitUnion)) { - xfree(pAwaitUnion); + free(pAwaitUnion); return BadAlloc; } @@ -1838,7 +1838,7 @@ ProcSyncCreateAlarm(client) status = SyncInitTrigger(client, pTrigger, None, XSyncCAAllTrigger); if (status != Success) { - xfree(pAlarm); + free(pAlarm); return status; } @@ -1852,13 +1852,13 @@ ProcSyncCreateAlarm(client) (CARD32 *)&stuff[1]); if (status != Success) { - xfree(pAlarm); + free(pAlarm); return status; } if (!AddResource(stuff->id, RTAlarm, pAlarm)) { - xfree(pAlarm); + free(pAlarm); return BadAlloc; } @@ -2346,7 +2346,7 @@ static void SyncResetProc(extEntry) ExtensionEntry *extEntry; { - xfree(SysCounterList); + free(SysCounterList); SysCounterList = NULL; RTCounter = 0; } diff --git a/nx-X11/programs/Xserver/Xext/xcmisc.c b/nx-X11/programs/Xserver/Xext/xcmisc.c index ee7d69fc3..8f381cee5 100644 --- a/nx-X11/programs/Xserver/Xext/xcmisc.c +++ b/nx-X11/programs/Xserver/Xext/xcmisc.c @@ -175,7 +175,7 @@ ProcXCMiscGetXIDList(client) client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write; WriteSwappedDataToClient(client, count * sizeof(XID), pids); } - Xfree(pids); + free(pids); return(client->noClientException); } diff --git a/nx-X11/programs/Xserver/Xext/xf86bigfont.c b/nx-X11/programs/Xserver/Xext/xf86bigfont.c index 848f0114b..7bdda72b4 100644 --- a/nx-X11/programs/Xserver/Xext/xf86bigfont.c +++ b/nx-X11/programs/Xserver/Xext/xf86bigfont.c @@ -257,7 +257,7 @@ shmalloc( if (shmid == -1) { ErrorF(XF86BIGFONTNAME " extension: shmget() failed, size = %u, errno = %d\n", size, errno); - xfree(pDesc); + free(pDesc); return (ShmDescPtr) NULL; } @@ -265,7 +265,7 @@ shmalloc( ErrorF(XF86BIGFONTNAME " extension: shmat() failed, size = %u, errno = %d\n", size, errno); shmctl(shmid, IPC_RMID, (void *) 0); - xfree(pDesc); + free(pDesc); return (ShmDescPtr) NULL; } @@ -294,7 +294,7 @@ shmdealloc( if (pDesc->next) pDesc->next->prev = pDesc->prev; *pDesc->prev = pDesc->next; - xfree(pDesc); + free(pDesc); } #endif diff --git a/nx-X11/programs/Xserver/Xext/xvdisp.c b/nx-X11/programs/Xserver/Xext/xvdisp.c index 3bcb130c7..b300a32d5 100644 --- a/nx-X11/programs/Xserver/Xext/xvdisp.c +++ b/nx-X11/programs/Xserver/Xext/xvdisp.c @@ -1281,7 +1281,7 @@ ProcXvQueryImageAttributes(ClientPtr client) SwapLongs((CARD32*)offsets, rep.length); WriteToClient(client, rep.length << 2, (char*)offsets); - xfree(offsets); + free(offsets); return Success; } diff --git a/nx-X11/programs/Xserver/Xext/xvmain.c b/nx-X11/programs/Xserver/Xext/xvmain.c index 571bb9c46..d2c21b13f 100644 --- a/nx-X11/programs/Xserver/Xext/xvmain.c +++ b/nx-X11/programs/Xserver/Xext/xvmain.c @@ -325,7 +325,7 @@ XvCloseScreen( (* pxvs->ddCloseScreen)(ii, pScreen); - xfree(pxvs); + free(pxvs); pScreen->devPrivates[XvScreenIndex].ptr = (void *)NULL; @@ -522,7 +522,7 @@ XvdiDestroyVideoNotifyList(void * pn, XID id) { npn = cpn->next; if (cpn->client) FreeResource(cpn->id, XvRTVideoNotify); - xfree(cpn); + free(cpn); cpn = npn; } return Success; @@ -946,7 +946,7 @@ XvdiSelectVideoNotify( tpn->next = (XvVideoNotifyPtr)NULL; if (!AddResource(pDraw->id, XvRTVideoNotifyList, tpn)) { - xfree(tpn); + free(tpn); return BadAlloc; } } diff --git a/nx-X11/programs/Xserver/Xext/xvmc.c b/nx-X11/programs/Xserver/Xext/xvmc.c index b1441fa1d..0ec04f3e3 100644 --- a/nx-X11/programs/Xserver/Xext/xvmc.c +++ b/nx-X11/programs/Xserver/Xext/xvmc.c @@ -75,7 +75,7 @@ XvMCDestroyContextRes(void * data, XID id) if(!pContext->refcnt) { XvMCScreenPtr pScreenPriv = XVMC_GET_PRIVATE(pContext->pScreen); (*pScreenPriv->adaptors[pContext->adapt_num].DestroyContext)(pContext); - xfree(pContext); + free(pContext); } return Success; @@ -89,7 +89,7 @@ XvMCDestroySurfaceRes(void * data, XID id) XvMCScreenPtr pScreenPriv = XVMC_GET_PRIVATE(pContext->pScreen); (*pScreenPriv->adaptors[pContext->adapt_num].DestroySurface)(pSurface); - xfree(pSurface); + free(pSurface); XvMCDestroyContextRes((void *)pContext, pContext->context_id); @@ -105,7 +105,7 @@ XvMCDestroySubpictureRes(void * data, XID id) XvMCScreenPtr pScreenPriv = XVMC_GET_PRIVATE(pContext->pScreen); (*pScreenPriv->adaptors[pContext->adapt_num].DestroySubpicture)(pSubpict); - xfree(pSubpict); + free(pSubpict); XvMCDestroyContextRes((void *)pContext, pContext->context_id); @@ -259,7 +259,7 @@ ProcXvMCCreateContext(ClientPtr client) result = (*adaptor->CreateContext)(pPort, pContext, &dwords, &data); if(result != Success) { - xfree(pContext); + free(pContext); return result; } @@ -276,7 +276,7 @@ ProcXvMCCreateContext(ClientPtr client) AddResource(pContext->context_id, XvMCRTContext, pContext); if(data) - xfree(data); + free(data); return Success; } @@ -324,7 +324,7 @@ ProcXvMCCreateSurface(ClientPtr client) pSurface, &dwords, &data); if(result != Success) { - xfree(pSurface); + free(pSurface); return result; } @@ -338,7 +338,7 @@ ProcXvMCCreateSurface(ClientPtr client) AddResource(pSurface->surface_id, XvMCRTSurface, pSurface); if(data) - xfree(data); + free(data); pContext->refcnt++; @@ -427,7 +427,7 @@ ProcXvMCCreateSubpicture(ClientPtr client) pSubpicture, &dwords, &data); if(result != Success) { - xfree(pSubpicture); + free(pSubpicture); return result; } @@ -449,7 +449,7 @@ ProcXvMCCreateSubpicture(ClientPtr client) AddResource(pSubpicture->subpicture_id, XvMCRTSubpicture, pSubpicture); if(data) - xfree(data); + free(data); pContext->refcnt++; @@ -708,7 +708,7 @@ XvMCCloseScreen (int i, ScreenPtr pScreen) pScreen->CloseScreen = pScreenPriv->CloseScreen; - xfree(pScreenPriv); + free(pScreenPriv); return (*pScreen->CloseScreen)(i, pScreen); } diff --git a/nx-X11/programs/Xserver/Xi/chgptr.c b/nx-X11/programs/Xserver/Xi/chgptr.c index 4877fcc84..2bbd7bc37 100644 --- a/nx-X11/programs/Xserver/Xi/chgptr.c +++ b/nx-X11/programs/Xserver/Xi/chgptr.c @@ -185,8 +185,8 @@ void DeleteFocusClassDeviceStruct(dev) DeviceIntPtr dev; { - xfree(dev->focus->trace); - xfree(dev->focus); + free(dev->focus->trace); + free(dev->focus); dev->focus = NULL; } diff --git a/nx-X11/programs/Xserver/Xi/exevents.c b/nx-X11/programs/Xserver/Xi/exevents.c index ce5fe9ec9..1612047bb 100644 --- a/nx-X11/programs/Xserver/Xi/exevents.c +++ b/nx-X11/programs/Xserver/Xi/exevents.c @@ -515,7 +515,7 @@ DeviceFocusEvent(dev, type, mode, detail, pWin) (void) DeliverEventsToWindow(pWin, (xEvent *)sev, evcount, DeviceStateNotifyMask, NullGrab, dev->id); - xfree (sev); + free (sev); } } @@ -830,17 +830,17 @@ InputClientGone(pWin, id) if (prev) { prev->next = other->next; - xfree(other); + free(other); } else if (!(other->next)) { if (ShouldFreeInputMasks(pWin, TRUE)) { wOtherInputMasks(pWin)->inputClients = other->next; - xfree(wOtherInputMasks(pWin)); + free(wOtherInputMasks(pWin)); pWin->optional->inputMasks = (OtherInputMasks *) NULL; CheckWindowOptionalNeed (pWin); - xfree(other); + free(other); } else { @@ -853,7 +853,7 @@ InputClientGone(pWin, id) else { wOtherInputMasks(pWin)->inputClients = other->next; - xfree(other); + free(other); } RecalculateDeviceDeliverableEvents(pWin); return(Success); @@ -1032,7 +1032,7 @@ SetModifierMapping(client, dev, len, rlen, numKeyPerModifier, inputMap, k) return BadAlloc; } if ((*k)->modifierKeyMap) - xfree((*k)->modifierKeyMap); + free((*k)->modifierKeyMap); if (inputMapLen) { (*k)->modifierKeyMap = map; memmove((char *)(*k)->modifierKeyMap, (char *)inputMap, inputMapLen); diff --git a/nx-X11/programs/Xserver/Xi/getdctl.c b/nx-X11/programs/Xserver/Xi/getdctl.c index d8c310d92..440c1eeb4 100644 --- a/nx-X11/programs/Xserver/Xi/getdctl.c +++ b/nx-X11/programs/Xserver/Xi/getdctl.c @@ -161,7 +161,7 @@ ProcXGetDeviceControl(client) rep.length = (total_length+3) >> 2; WriteReplyToClient(client, sizeof(xGetDeviceControlReply), &rep); WriteToClient(client, total_length, savbuf); - xfree (savbuf); + free (savbuf); return Success; } diff --git a/nx-X11/programs/Xserver/Xi/getfctl.c b/nx-X11/programs/Xserver/Xi/getfctl.c index c6cb8457c..e2f243430 100644 --- a/nx-X11/programs/Xserver/Xi/getfctl.c +++ b/nx-X11/programs/Xserver/Xi/getfctl.c @@ -190,7 +190,7 @@ ProcXGetFeedbackControl(client) rep.length = (total_length+3) >> 2; WriteReplyToClient(client, sizeof(xGetFeedbackControlReply), &rep); WriteToClient(client, total_length, savbuf); - xfree (savbuf); + free (savbuf); return Success; } diff --git a/nx-X11/programs/Xserver/Xi/getprop.c b/nx-X11/programs/Xserver/Xi/getprop.c index ac37617ec..33d49fb95 100644 --- a/nx-X11/programs/Xserver/Xi/getprop.c +++ b/nx-X11/programs/Xserver/Xi/getprop.c @@ -154,7 +154,7 @@ ProcXGetDeviceDontPropagateList (client) { client->pSwapReplyFunc = (ReplySwapPtr)Swap32Write; WriteSwappedDataToClient( client, count * sizeof(XEventClass), buf); - xfree (buf); + free (buf); } return Success; } diff --git a/nx-X11/programs/Xserver/Xi/getselev.c b/nx-X11/programs/Xserver/Xi/getselev.c index 7cd97b5ef..05d9d987c 100644 --- a/nx-X11/programs/Xserver/Xi/getselev.c +++ b/nx-X11/programs/Xserver/Xi/getselev.c @@ -168,7 +168,7 @@ ProcXGetSelectedExtensionEvents(client) { client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write; WriteSwappedDataToClient( client, total_length, buf); - xfree (buf); + free (buf); } return Success; } diff --git a/nx-X11/programs/Xserver/Xi/listdev.c b/nx-X11/programs/Xserver/Xi/listdev.c index e99584d0e..2e78aa339 100644 --- a/nx-X11/programs/Xserver/Xi/listdev.c +++ b/nx-X11/programs/Xserver/Xi/listdev.c @@ -144,7 +144,7 @@ ProcXListInputDevices (client) rep.length = (total_length + 3) >> 2; WriteReplyToClient (client, sizeof (xListInputDevicesReply), &rep); WriteToClient(client, total_length, savbuf); - xfree (savbuf); + free (savbuf); return Success; } diff --git a/nx-X11/programs/Xserver/Xi/queryst.c b/nx-X11/programs/Xserver/Xi/queryst.c index af2b4301d..975643e0e 100644 --- a/nx-X11/programs/Xserver/Xi/queryst.c +++ b/nx-X11/programs/Xserver/Xi/queryst.c @@ -190,7 +190,7 @@ ProcXQueryDeviceState(client) WriteReplyToClient (client, sizeof(xQueryDeviceStateReply), &rep); if (total_length > 0) WriteToClient (client, total_length, savbuf); - xfree (savbuf); + free (savbuf); return Success; } diff --git a/nx-X11/programs/Xserver/composite/compalloc.c b/nx-X11/programs/Xserver/composite/compalloc.c index 017459b6b..a5d0998eb 100644 --- a/nx-X11/programs/Xserver/composite/compalloc.c +++ b/nx-X11/programs/Xserver/composite/compalloc.c @@ -159,7 +159,7 @@ compRedirectWindow(ClientPtr pClient, WindowPtr pWin, int update) cw = xalloc (sizeof (CompWindowRec)); if (!cw) { - xfree (ccw); + free (ccw); return BadAlloc; } cw->damage = DamageCreate (compReportDamage, @@ -170,8 +170,8 @@ compRedirectWindow(ClientPtr pClient, WindowPtr pWin, int update) pWin); if (!cw->damage) { - xfree (ccw); - xfree (cw); + free (ccw); + free (cw); return BadAlloc; } @@ -269,7 +269,7 @@ compFreeClientWindow (WindowPtr pWin, XID id) *prev = ccw->next; if (ccw->update == CompositeRedirectManual) cw->update = CompositeRedirectAutomatic; - xfree (ccw); + free (ccw); break; } } @@ -288,7 +288,7 @@ compFreeClientWindow (WindowPtr pWin, XID id) RegionUninit(&cw->borderClip); FAKE_DIX_SET_WINDOW_PRIVATE(pWin, NULL); - xfree (cw); + free (cw); } else if (cw->update == CompositeRedirectAutomatic && !cw->damageRegistered && pWin->redirectDraw != RedirectDrawNone) @@ -368,7 +368,7 @@ compRedirectSubwindows (ClientPtr pClient, WindowPtr pWin, int update) csw = xalloc (sizeof (CompSubwindowsRec)); if (!csw) { - xfree (ccw); + free (ccw); return BadAlloc; } csw->update = CompositeRedirectAutomatic; @@ -387,10 +387,10 @@ compRedirectSubwindows (ClientPtr pClient, WindowPtr pWin, int update) (void) compUnredirectWindow (pClient, pChild, update); if (!csw->clients) { - xfree (csw); + free (csw); FAKE_DIX_SET_SUBWINDOWS_PRIVATE(pWin, NULL); } - xfree (ccw); + free (ccw); return ret; } } @@ -451,7 +451,7 @@ compFreeClientSubwindows (WindowPtr pWin, XID id) for (pChild = pWin->lastChild; pChild; pChild = pChild->prevSib) (void) compUnredirectWindow (pClient, pChild, ccw->update); - xfree (ccw); + free (ccw); break; } } @@ -462,7 +462,7 @@ compFreeClientSubwindows (WindowPtr pWin, XID id) if (!csw->clients) { FAKE_DIX_SET_SUBWINDOWS_PRIVATE(pWin, NULL); - xfree (csw); + free (csw); } } diff --git a/nx-X11/programs/Xserver/composite/compinit.c b/nx-X11/programs/Xserver/composite/compinit.c index c86aaed5a..930787195 100644 --- a/nx-X11/programs/Xserver/composite/compinit.c +++ b/nx-X11/programs/Xserver/composite/compinit.c @@ -76,7 +76,7 @@ compCloseScreen (int index, ScreenPtr pScreen) pScreen->GetSpans = cs->GetSpans; pScreen->SourceValidate = cs->SourceValidate; - xfree (cs); + free (cs); FAKE_DIX_SET_SCREEN_PRIVATE(pScreen, NULL); ret = (*pScreen->CloseScreen) (index, pScreen); return ret; @@ -422,7 +422,7 @@ compScreenInit (ScreenPtr pScreen) if (!compAddAlternateVisuals (pScreen, cs)) { - xfree (cs); + free (cs); return FALSE; } diff --git a/nx-X11/programs/Xserver/damageext/damageext.c b/nx-X11/programs/Xserver/damageext/damageext.c index d14f14985..aedbecb7b 100755 --- a/nx-X11/programs/Xserver/damageext/damageext.c +++ b/nx-X11/programs/Xserver/damageext/damageext.c @@ -214,7 +214,7 @@ ProcDamageCreate (ClientPtr client) pDamageExt); if (!pDamageExt->pDamage) { - xfree (pDamageExt); + free (pDamageExt); return BadAlloc; } if (!AddResource (stuff->damage, DamageExtType, (void *) pDamageExt)) @@ -412,7 +412,7 @@ FreeDamageExt (void * value, XID did) DamageUnregister (pDamageExt->pDrawable, pDamageExt->pDamage); DamageDestroy (pDamageExt->pDamage); } - xfree (pDamageExt); + free (pDamageExt); return Success; } diff --git a/nx-X11/programs/Xserver/dbe/dbe.c b/nx-X11/programs/Xserver/dbe/dbe.c index 064987dec..e64b6bd22 100644 --- a/nx-X11/programs/Xserver/dbe/dbe.c +++ b/nx-X11/programs/Xserver/dbe/dbe.c @@ -476,7 +476,7 @@ ProcDbeAllocateBackBufferName(client) } /* Free what was allocated by the GetVisualInfo() call above. */ - xfree(scrVisInfo.visinfo); + free(scrVisInfo.visinfo); if (!visualMatched) { @@ -499,7 +499,7 @@ ProcDbeAllocateBackBufferName(client) if (!AddResource(stuff->buffer, dbeWindowPrivResType, (void *)pDbeWindowPriv)) { - xfree(pDbeWindowPriv); + free(pDbeWindowPriv); return(BadAlloc); } @@ -610,7 +610,7 @@ ProcDbeAllocateBackBufferName(client) /* The DDX buffer allocation routine failed for the first buffer of * this window. */ - xfree(pDbeWindowPriv); + free(pDbeWindowPriv); return(status); } @@ -761,14 +761,14 @@ ProcDbeSwapBuffers(client) if (!(pWin = SecurityLookupWindow(dbeSwapInfo[i].window, client, SecurityWriteAccess))) { - Xfree(swapInfo); + free(swapInfo); return(BadWindow); } /* Each window must be double-buffered - BadMatch. */ if (DBE_WINDOW_PRIV(pWin) == NULL) { - Xfree(swapInfo); + free(swapInfo); return(BadMatch); } @@ -777,7 +777,7 @@ ProcDbeSwapBuffers(client) { if (dbeSwapInfo[i].window == dbeSwapInfo[j].window) { - Xfree(swapInfo); + free(swapInfo); return(BadMatch); } } @@ -788,7 +788,7 @@ ProcDbeSwapBuffers(client) (dbeSwapInfo[i].swapAction != XdbeUntouched ) && (dbeSwapInfo[i].swapAction != XdbeCopied )) { - Xfree(swapInfo); + free(swapInfo); return(BadValue); } @@ -818,12 +818,12 @@ ProcDbeSwapBuffers(client) error = (*pDbeScreenPriv->SwapBuffers)(client, &nStuff, swapInfo); if (error != Success) { - Xfree(swapInfo); + free(swapInfo); return(error); } } - Xfree(swapInfo); + free(swapInfo); return(Success); } /* ProcDbeSwapBuffers() */ @@ -925,7 +925,7 @@ ProcDbeGetVisualInfo(client) if (!(pDrawables[i] = (DrawablePtr)SecurityLookupDrawable( drawables[i], client, SecurityReadAccess))) { - Xfree(pDrawables); + free(pDrawables); return(BadDrawable); } } @@ -937,7 +937,7 @@ ProcDbeGetVisualInfo(client) { if (pDrawables) { - Xfree(pDrawables); + free(pDrawables); } return(BadAlloc); @@ -958,13 +958,13 @@ ProcDbeGetVisualInfo(client) /* Free visinfos that we allocated for previous screen infos.*/ for (j = 0; j < i; j++) { - xfree(pScrVisInfo[j].visinfo); + free(pScrVisInfo[j].visinfo); } /* Free pDrawables if we needed to allocate it above. */ if (pDrawables) { - Xfree(pDrawables); + free(pDrawables); } return(BadAlloc); @@ -1039,13 +1039,13 @@ ProcDbeGetVisualInfo(client) /* Clean up memory. */ for (i = 0; i < count; i++) { - xfree(pScrVisInfo[i].visinfo); + free(pScrVisInfo[i].visinfo); } - xfree(pScrVisInfo); + free(pScrVisInfo); if (pDrawables) { - Xfree(pDrawables); + free(pDrawables); } return(client->noClientException); @@ -1640,7 +1640,7 @@ DbeWindowPrivDelete(pDbeWinPriv, id) DBE_INIT_MAX_IDS * sizeof(XID)); /* Free the extended array; use the static array. */ - xfree(pDbeWindowPriv->IDs); + free(pDbeWindowPriv->IDs); pDbeWindowPriv->IDs = pDbeWindowPriv->initIDs; pDbeWindowPriv->maxAvailableIDs = DBE_INIT_MAX_IDS; } @@ -1671,7 +1671,7 @@ DbeWindowPrivDelete(pDbeWinPriv, id) (void *)NULL; /* We are done with the window priv. */ - xfree(pDbeWindowPriv); + free(pDbeWindowPriv); } return(Success); @@ -1719,10 +1719,10 @@ DbeResetProc(extEntry) if (pDbeScreenPriv->winPrivPrivSizes) { - xfree(pDbeScreenPriv->winPrivPrivSizes); + free(pDbeScreenPriv->winPrivPrivSizes); } - xfree(pDbeScreenPriv); + free(pDbeScreenPriv); } } @@ -1882,7 +1882,7 @@ DbeExtensionInit() for (j = 0; j < i; j++) { - xfree(screenInfo.screens[j]->devPrivates[dbeScreenPrivIndex].ptr); + free(screenInfo.screens[j]->devPrivates[dbeScreenPrivIndex].ptr); screenInfo.screens[j]->devPrivates[dbeScreenPrivIndex].ptr = NULL; } return; @@ -1986,7 +1986,7 @@ DbeExtensionInit() for (i = 0; i < screenInfo.numScreens; i++) { - xfree(screenInfo.screens[i]->devPrivates[dbeScreenPrivIndex].ptr); + free(screenInfo.screens[i]->devPrivates[dbeScreenPrivIndex].ptr); pScreen->devPrivates[dbeScreenPrivIndex].ptr = NULL; } return; diff --git a/nx-X11/programs/Xserver/dix/atom.c b/nx-X11/programs/Xserver/dix/atom.c index 29e60be03..fdb1c18a2 100644 --- a/nx-X11/programs/Xserver/dix/atom.c +++ b/nx-X11/programs/Xserver/dix/atom.c @@ -120,7 +120,7 @@ MakeAtom(const char *string, unsigned len, Bool makeit) { nd->string = (char *) xalloc(len + 1); if (!nd->string) { - xfree(nd); + free(nd); return BAD_RESOURCE; } strncpy(nd->string, string, (int)len); @@ -133,8 +133,8 @@ MakeAtom(const char *string, unsigned len, Bool makeit) tableLength * (2 * sizeof(NodePtr))); if (!table) { if (nd->string != string) - xfree(nd->string); - xfree(nd); + free(nd->string); + free(nd); return BAD_RESOURCE; } tableLength <<= 1; @@ -180,8 +180,8 @@ FreeAtom(NodePtr patom) if(patom->right) FreeAtom(patom->right); if (patom->a > XA_LAST_PREDEFINED) - xfree(patom->string); - xfree(patom); + free(patom->string); + free(patom); } void @@ -191,7 +191,7 @@ FreeAllAtoms() return; FreeAtom(atomRoot); atomRoot = (NodePtr)NULL; - xfree(nodeTable); + free(nodeTable); nodeTable = (NodePtr *)NULL; lastAtom = None; } diff --git a/nx-X11/programs/Xserver/dix/colormap.c b/nx-X11/programs/Xserver/dix/colormap.c index 4acfdc1bb..39da0abd4 100644 --- a/nx-X11/programs/Xserver/dix/colormap.c +++ b/nx-X11/programs/Xserver/dix/colormap.c @@ -306,7 +306,7 @@ CreateColormap (Colormap mid, ScreenPtr pScreen, VisualPtr pVisual, ppix = (Pixel *)xalloc(size * sizeof(Pixel)); if (!ppix) { - xfree(pmap); + free(pmap); return (BadAlloc); } pmap->clientPixelsRed[client] = ppix; @@ -352,8 +352,8 @@ CreateColormap (Colormap mid, ScreenPtr pScreen, VisualPtr pVisual, ppix = (Pixel *) xalloc(size * sizeof(Pixel)); if (!ppix) { - xfree(pmap->clientPixelsRed[client]); - xfree(pmap); + free(pmap->clientPixelsRed[client]); + free(pmap); return(BadAlloc); } pmap->clientPixelsGreen[client] = ppix; @@ -368,9 +368,9 @@ CreateColormap (Colormap mid, ScreenPtr pScreen, VisualPtr pVisual, ppix = (Pixel *) xalloc(size * sizeof(Pixel)); if (!ppix) { - xfree(pmap->clientPixelsGreen[client]); - xfree(pmap->clientPixelsRed[client]); - xfree(pmap); + free(pmap->clientPixelsGreen[client]); + free(pmap->clientPixelsRed[client]); + free(pmap); return(BadAlloc); } pmap->clientPixelsBlue[client] = ppix; @@ -438,7 +438,7 @@ FreeColormap (void * value, XID mid) if(pmap->clientPixelsRed) { for(i = 0; i < MAXCLIENTS; i++) - xfree(pmap->clientPixelsRed[i]); + free(pmap->clientPixelsRed[i]); } if ((pmap->class == PseudoColor) || (pmap->class == GrayScale)) @@ -450,11 +450,11 @@ FreeColormap (void * value, XID mid) if(pent->fShared) { if (--pent->co.shco.red->refcnt == 0) - xfree(pent->co.shco.red); + free(pent->co.shco.red); if (--pent->co.shco.green->refcnt == 0) - xfree(pent->co.shco.green); + free(pent->co.shco.green); if (--pent->co.shco.blue->refcnt == 0) - xfree(pent->co.shco.blue); + free(pent->co.shco.blue); } } } @@ -462,15 +462,15 @@ FreeColormap (void * value, XID mid) { for(i = 0; i < MAXCLIENTS; i++) { - xfree(pmap->clientPixelsGreen[i]); - xfree(pmap->clientPixelsBlue[i]); + free(pmap->clientPixelsGreen[i]); + free(pmap->clientPixelsBlue[i]); } } if (pmap->devPrivates) - xfree(pmap->devPrivates); + free(pmap->devPrivates); - xfree(pmap); + free(pmap); return(Success); } @@ -721,11 +721,11 @@ FreeCell (ColormapPtr pmap, Pixel i, int channel) if (pent->fShared) { if(--pent->co.shco.red->refcnt == 0) - xfree(pent->co.shco.red); + free(pent->co.shco.red); if(--pent->co.shco.green->refcnt == 0) - xfree(pent->co.shco.green); + free(pent->co.shco.green); if(--pent->co.shco.blue->refcnt == 0) - xfree(pent->co.shco.blue); + free(pent->co.shco.blue); pent->fShared = FALSE; } pent->refcnt = 0; @@ -1518,7 +1518,7 @@ FreePixels(register ColormapPtr pmap, register int client) } } - xfree(ppixStart); + free(ppixStart); pmap->clientPixelsRed[client] = (Pixel *) NULL; pmap->numPixelsRed[client] = 0; if ((class | DynamicClass) == DirectColor) @@ -1527,7 +1527,7 @@ FreePixels(register ColormapPtr pmap, register int client) if (class & DynamicClass) for (ppix = ppixStart, n = pmap->numPixelsGreen[client]; --n >= 0;) FreeCell(pmap, *ppix++, GREENMAP); - xfree(ppixStart); + free(ppixStart); pmap->clientPixelsGreen[client] = (Pixel *) NULL; pmap->numPixelsGreen[client] = 0; @@ -1535,7 +1535,7 @@ FreePixels(register ColormapPtr pmap, register int client) if (class & DynamicClass) for (ppix = ppixStart, n = pmap->numPixelsBlue[client]; --n >= 0; ) FreeCell(pmap, *ppix++, BLUEMAP); - xfree(ppixStart); + free(ppixStart); pmap->clientPixelsBlue[client] = (Pixel *) NULL; pmap->numPixelsBlue[client] = 0; } @@ -1556,7 +1556,7 @@ FreeClientPixels (void * value, XID fakeid) pmap = (ColormapPtr) LookupIDByType(pcr->mid, RT_COLORMAP); if (pmap) FreePixels(pmap, pcr->client); - xfree(pcr); + free(pcr); return Success; } @@ -1626,7 +1626,7 @@ AllocColorCells (int client, ColormapPtr pmap, int colors, int planes, if (!AddResource(FakeClientID(client), RT_CMAPENTRY, (void *)pcr)) ok = BadAlloc; } else if (pcr) - xfree(pcr); + free(pcr); return (ok); } @@ -1717,7 +1717,7 @@ AllocColorPlanes (int client, ColormapPtr pmap, int colors, if (!AddResource(FakeClientID(client), RT_CMAPENTRY, (void *)pcr)) ok = BadAlloc; } else if (pcr) - xfree(pcr); + free(pcr); return (ok); } @@ -2092,7 +2092,7 @@ AllocShared (ColormapPtr pmap, Pixel *ppix, int c, int r, int g, int b, if (!(ppshared[z] = (SHAREDCOLOR *)xalloc(sizeof(SHAREDCOLOR)))) { for (z++ ; z < npixShared; z++) - xfree(ppshared[z]); + free(ppshared[z]); return FALSE; } } @@ -2372,7 +2372,7 @@ FreeCo (ColormapPtr pmap, int client, int color, int npixIn, Pixel *ppixIn, Pixe else { npixClient = 0; - xfree(ppixClient); + free(ppixClient); ppixClient = (Pixel *)NULL; } switch(color) diff --git a/nx-X11/programs/Xserver/dix/cursor.c b/nx-X11/programs/Xserver/dix/cursor.c index 1e1dba36b..575ff1eb4 100644 --- a/nx-X11/programs/Xserver/dix/cursor.c +++ b/nx-X11/programs/Xserver/dix/cursor.c @@ -81,10 +81,10 @@ FreeCursorBits(CursorBitsPtr bits) { if (--bits->refcnt > 0) return; - xfree(bits->source); - xfree(bits->mask); + free(bits->source); + free(bits->mask); #ifdef ARGB_CURSOR - xfree(bits->argb); + free(bits->argb); #endif if (bits->refcnt == 0) { @@ -98,9 +98,9 @@ FreeCursorBits(CursorBitsPtr bits) { *prev = this->next; CloseFont(this->font, (Font)0); - xfree(this); + free(this); } - xfree(bits); + free(bits); } } @@ -126,7 +126,7 @@ FreeCursor(void * value, XID cid) (void)( *pscr->UnrealizeCursor)( pscr, pCurs); } FreeCursorBits(pCurs->bits); - xfree( pCurs); + free( pCurs); return(Success); } @@ -177,8 +177,8 @@ AllocCursorARGB(unsigned char *psrcbits, unsigned char *pmaskbits, CARD32 *argb, pCurs = (CursorPtr)xalloc(sizeof(CursorRec) + sizeof(CursorBits)); if (!pCurs) { - xfree(psrcbits); - xfree(pmaskbits); + free(psrcbits); + free(pmaskbits); return (CursorPtr)NULL; } bits = (CursorBitsPtr)((char *)pCurs + sizeof(CursorRec)); @@ -223,7 +223,7 @@ AllocCursorARGB(unsigned char *psrcbits, unsigned char *pmaskbits, CARD32 *argb, ( *pscr->UnrealizeCursor)( pscr, pCurs); } FreeCursorBits(bits); - xfree(pCurs); + free(pCurs); return (CursorPtr)NULL; } } @@ -329,7 +329,7 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar, } if ((res = ServerBitsFromGlyph(sourcefont, sourceChar, &cm, &srcbits)) != 0) { - xfree(mskbits); + free(mskbits); return res; } if (sourcefont != maskfont) @@ -350,9 +350,9 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar, } if (!bits) { - xfree(pCurs); - xfree(mskbits); - xfree(srcbits); + free(pCurs); + free(mskbits); + free(srcbits); return BadAlloc; } bits->source = srcbits; @@ -414,7 +414,7 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar, ( *pscr->UnrealizeCursor)( pscr, pCurs); } FreeCursorBits(pCurs->bits); - xfree(pCurs); + free(pCurs); return BadAlloc; } } diff --git a/nx-X11/programs/Xserver/dix/devices.c b/nx-X11/programs/Xserver/dix/devices.c index 49ab80529..314714152 100644 --- a/nx-X11/programs/Xserver/dix/devices.c +++ b/nx-X11/programs/Xserver/dix/devices.c @@ -208,29 +208,29 @@ CloseDevice(register DeviceIntPtr dev) if (dev->inited) (void)(*dev->deviceProc)(dev, DEVICE_CLOSE); - xfree(dev->name); + free(dev->name); if (dev->key) { #ifdef XKB if (dev->key->xkbInfo) XkbFreeInfo(dev->key->xkbInfo); #endif - xfree(dev->key->curKeySyms.map); - xfree(dev->key->modifierKeyMap); - xfree(dev->key); + free(dev->key->curKeySyms.map); + free(dev->key->modifierKeyMap); + free(dev->key); } - xfree(dev->valuator); + free(dev->valuator); #ifdef XKB if ((dev->button)&&(dev->button->xkb_acts)) - xfree(dev->button->xkb_acts); + free(dev->button->xkb_acts); #endif - xfree(dev->button); + free(dev->button); if (dev->focus) { - xfree(dev->focus->trace); - xfree(dev->focus); + free(dev->focus->trace); + free(dev->focus); } - xfree(dev->proximity); + free(dev->proximity); for (k=dev->kbdfeed; k; k=knext) { knext = k->next; @@ -238,29 +238,29 @@ CloseDevice(register DeviceIntPtr dev) if (k->xkb_sli) XkbFreeSrvLedInfo(k->xkb_sli); #endif - xfree(k); + free(k); } for (p=dev->ptrfeed; p; p=pnext) { pnext = p->next; - xfree(p); + free(p); } for (i=dev->intfeed; i; i=inext) { inext = i->next; - xfree(i); + free(i); } for (s=dev->stringfeed; s; s=snext) { snext = s->next; - xfree(s->ctrl.symbols_supported); - xfree(s->ctrl.symbols_displayed); - xfree(s); + free(s->ctrl.symbols_supported); + free(s->ctrl.symbols_displayed); + free(s); } for (b=dev->bell; b; b=bnext) { bnext = b->next; - xfree(b); + free(b); } for (l=dev->leds; l; l=lnext) { @@ -269,15 +269,15 @@ CloseDevice(register DeviceIntPtr dev) if (l->xkb_sli) XkbFreeSrvLedInfo(l->xkb_sli); #endif - xfree(l); + free(l); } #ifdef XKB while (dev->xkb_interest) { XkbRemoveResourceClient((DevicePtr)dev,dev->xkb_interest->resource); } #endif - xfree(dev->sync.event); - xfree(dev); + free(dev->sync.event); + free(dev); } void @@ -471,7 +471,7 @@ SetKeySymsMap(register KeySymsPtr dst, register KeySymsPtr src) memmove((char *)&map[i*src->mapWidth], (char *)&dst->map[i*dst->mapWidth], dst->mapWidth * sizeof(KeySym)); - xfree(dst->map); + free(dst->map); } dst->mapWidth = src->mapWidth; dst->map = map; @@ -550,9 +550,9 @@ InitKeyClassDeviceStruct(DeviceIntPtr dev, KeySymsPtr pKeySyms, CARD8 pModifiers keyc->modifierKeyCount[i] = 0; if (!SetKeySymsMap(&keyc->curKeySyms, pKeySyms) || !InitModMap(keyc)) { - xfree(keyc->curKeySyms.map); - xfree(keyc->modifierKeyMap); - xfree(keyc); + free(keyc->curKeySyms.map); + free(keyc->modifierKeyMap); + free(keyc); return FALSE; } dev->key = keyc; @@ -722,10 +722,10 @@ InitStringFeedbackClassDeviceStruct ( if (!feedc->ctrl.symbols_supported || !feedc->ctrl.symbols_displayed) { if (feedc->ctrl.symbols_supported) - xfree(feedc->ctrl.symbols_supported); + free(feedc->ctrl.symbols_supported); if (feedc->ctrl.symbols_displayed) - xfree(feedc->ctrl.symbols_displayed); - xfree(feedc); + free(feedc->ctrl.symbols_displayed); + free(feedc); return FALSE; } for (i=0; i<num_symbols_supported; i++) @@ -1001,7 +1001,7 @@ ProcSetModifierMapping(ClientPtr client) if (!map && inputMapLen) return BadAlloc; if (keyc->modifierKeyMap) - xfree(keyc->modifierKeyMap); + free(keyc->modifierKeyMap); keyc->modifierKeyMap = map; memmove((char *)map, (char *)inputMap, inputMapLen); diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c index 803870369..9b9021d62 100644 --- a/nx-X11/programs/Xserver/dix/dispatch.c +++ b/nx-X11/programs/Xserver/dix/dispatch.c @@ -214,7 +214,7 @@ void InitSelections() { if (CurrentSelections) - xfree(CurrentSelections); + free(CurrentSelections); CurrentSelections = (Selection *)NULL; NumCurrentSelections = 0; } @@ -3090,7 +3090,7 @@ ProcCreateCursor (register ClientPtr client) mskbits = (unsigned char *)xalloc(n); if (!mskbits) { - xfree(srcbits); + free(srcbits); return (BadAlloc); } @@ -3332,7 +3332,7 @@ ProcListHosts(register ClientPtr client) client->pSwapReplyFunc = (ReplySwapPtr) SLHostsExtend; WriteSwappedDataToClient(client, len, pdata); } - xfree(pdata); + free(pdata); return (client->noClientException); } @@ -3600,7 +3600,7 @@ CloseDownClient(register ClientPtr client) #ifdef SMART_SCHEDULE SmartLastClient = NullClient; #endif - xfree(client); + free(client); while (!clients[currentMaxClients-1]) currentMaxClients--; @@ -3760,7 +3760,7 @@ ClientPtr NextAvailableClient(void * ospriv) InitClientPrivates(client); if (!InitClientResources(client)) { - xfree(client); + free(client); return (ClientPtr)NULL; } data.reqType = 1; @@ -3768,7 +3768,7 @@ ClientPtr NextAvailableClient(void * ospriv) if (!InsertFakeRequest(client, (char *)&data, sz_xReq)) { FreeClientResources(client); - xfree(client); + free(client); return (ClientPtr)NULL; } if (i == currentMaxClients) diff --git a/nx-X11/programs/Xserver/dix/dixfonts.c b/nx-X11/programs/Xserver/dix/dixfonts.c index 58e562411..1a0352387 100644 --- a/nx-X11/programs/Xserver/dix/dixfonts.c +++ b/nx-X11/programs/Xserver/dix/dixfonts.c @@ -226,8 +226,8 @@ FreeFPE (FontPathElementPtr fpe) fpe->refcount--; if (fpe->refcount == 0) { (*fpe_functions[fpe->type].free_fpe) (fpe); - xfree(fpe->name); - xfree(fpe); + free(fpe->name); + free(fpe); } } @@ -377,9 +377,9 @@ bail: for (i = 0; i < c->num_fpes; i++) { FreeFPE(c->fpe_list[i]); } - xfree(c->fpe_list); - xfree(c->fontname); - xfree(c); + free(c->fpe_list); + free(c->fontname); + free(c); return TRUE; } #endif /* NXAGENT_SERVER */ @@ -397,7 +397,7 @@ OpenFont(ClientPtr client, XID fid, Mask flags, unsigned lenfname, char *pfontna memmove(f, pfontname, lenfname); f[lenfname] = '\0'; ErrorF("OpenFont: fontname is \"%s\"\n", f); - xfree(f); + free(f); #endif if (!lenfname || lenfname > XLFDMAXFONTNAMELEN) return BadName; @@ -437,7 +437,7 @@ OpenFont(ClientPtr client, XID fid, Mask flags, unsigned lenfname, char *pfontna c->origFontName = pfontname; c->origFontNameLen = lenfname; if (!c->fontname) { - xfree(c); + free(c); return BadAlloc; } /* @@ -447,8 +447,8 @@ OpenFont(ClientPtr client, XID fid, Mask flags, unsigned lenfname, char *pfontna c->fpe_list = (FontPathElementPtr *) xalloc(sizeof(FontPathElementPtr) * num_fpes); if (!c->fpe_list) { - xfree(c->fontname); - xfree(c); + free(c->fontname); + free(c); return BadAlloc; } memmove(c->fontname, pfontname, lenfname); @@ -679,7 +679,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c) return TRUE; } if (err == FontNameAlias) { - if (resolved) xfree(resolved); + if (resolved) free(resolved); resolved = (char *) xalloc(resolvedlen + 1); if (resolved) memmove(resolved, tmpname, resolvedlen + 1); @@ -734,7 +734,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c) c->saved = c->current; c->haveSaved = TRUE; if (c->savedName) - xfree(c->savedName); + free(c->savedName); c->savedName = (char *)xalloc(namelen + 1); if (c->savedName) memmove(c->savedName, name, namelen + 1); @@ -829,11 +829,11 @@ bail: ClientWakeup(client); for (i = 0; i < c->num_fpes; i++) FreeFPE(c->fpe_list[i]); - xfree(c->fpe_list); - if (c->savedName) xfree(c->savedName); + free(c->fpe_list); + if (c->savedName) free(c->savedName); FreeFontNames(names); - xfree(c); - if (resolved) xfree(resolved); + free(c); + if (resolved) free(resolved); return TRUE; } @@ -858,14 +858,14 @@ ListFonts(ClientPtr client, unsigned char *pattern, unsigned length, c->fpe_list = (FontPathElementPtr *) xalloc(sizeof(FontPathElementPtr) * num_fpes); if (!c->fpe_list) { - xfree(c); + free(c); return BadAlloc; } c->names = MakeFontNamesRecord(max_names < 100 ? max_names : 100); if (!c->names) { - xfree(c->fpe_list); - xfree(c); + free(c->fpe_list); + free(c); return BadAlloc; } memmove( c->current.pattern, pattern, length); @@ -994,7 +994,7 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c) c->haveSaved = TRUE; c->savedNumFonts = numFonts; if (c->savedName) - xfree(c->savedName); + free(c->savedName); c->savedName = (char *)xalloc(namelen + 1); if (c->savedName) memmove(c->savedName, name, namelen + 1); @@ -1084,8 +1084,8 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c) (void) WriteToClient(client, namelen, name); if (pFontInfo == &fontInfo) { - xfree(fontInfo.props); - xfree(fontInfo.isStringProp); + free(fontInfo.props); + free(fontInfo.isStringProp); } --c->current.max_names; } @@ -1103,10 +1103,10 @@ bail: ClientWakeup(client); for (i = 0; i < c->num_fpes; i++) FreeFPE(c->fpe_list[i]); - xfree(c->reply); - xfree(c->fpe_list); - if (c->savedName) xfree(c->savedName); - xfree(c); + free(c->reply); + free(c->fpe_list); + if (c->savedName) free(c->savedName); + free(c); return TRUE; } #endif /* NXAGENT_SERVER */ @@ -1133,7 +1133,7 @@ StartListFontsWithInfo(ClientPtr client, int length, unsigned char *pattern, xalloc(sizeof(FontPathElementPtr) * num_fpes); if (!c->fpe_list) { - xfree(c); + free(c); goto badAlloc; } memmove(c->current.pattern, pattern, length); @@ -1330,7 +1330,7 @@ doPolyText(ClientPtr client, register PTclosurePtr c) c->data = (unsigned char *)xalloc(len); if (!c->data) { - xfree(c); + free(c); err = BadAlloc; goto bail; } @@ -1343,8 +1343,8 @@ doPolyText(ClientPtr client, register PTclosurePtr c) pGC = GetScratchGC(c->pGC->depth, c->pGC->pScreen); if (!pGC) { - xfree(c->data); - xfree(c); + free(c->data); + free(c); err = BadAlloc; goto bail; } @@ -1366,8 +1366,8 @@ doPolyText(ClientPtr client, register PTclosurePtr c) Success) { FreeScratchGC(pGC); - xfree(c->data); - xfree(c); + free(c->data); + free(c); err = BadAlloc; goto bail; } @@ -1434,8 +1434,8 @@ bail: c->pGC->font = NullFont; FreeScratchGC(c->pGC); - xfree(c->data); - xfree(c); + free(c->data); + free(c); } return TRUE; } @@ -1530,7 +1530,7 @@ doImageText(ClientPtr client, register ITclosurePtr c) data = (unsigned char *)xalloc(c->nChars * c->itemSize); if (!data) { - xfree(c); + free(c); c = old_closure; err = BadAlloc; goto bail; @@ -1541,8 +1541,8 @@ doImageText(ClientPtr client, register ITclosurePtr c) pGC = GetScratchGC(c->pGC->depth, c->pGC->pScreen); if (!pGC) { - xfree(c->data); - xfree(c); + free(c->data); + free(c); c = old_closure; err = BadAlloc; goto bail; @@ -1562,8 +1562,8 @@ doImageText(ClientPtr client, register ITclosurePtr c) GCClipYOrigin | GCClipMask)) != Success) { FreeScratchGC(pGC); - xfree(c->data); - xfree(c); + free(c->data); + free(c); c = old_closure; err = BadAlloc; goto bail; @@ -1602,8 +1602,8 @@ bail: c->pGC->font = NullFont; FreeScratchGC(c->pGC); - xfree(c->data); - xfree(c); + free(c->data); + free(c); } return TRUE; } @@ -1677,7 +1677,7 @@ FreeFontPath(FontPathElementPtr *list, int n, Bool force) } FreeFPE(list[i]); } - xfree((char *) list); + free((char *) list); } static FontPathElementPtr @@ -1754,7 +1754,7 @@ SetFontPathElements(int npaths, unsigned char *paths, int *bad, Bool persist) fpe->name = (char *) xalloc(len + 1); if (!fpe->name) { - xfree(fpe); + free(fpe); err = BadAlloc; goto bail; } @@ -1777,8 +1777,8 @@ SetFontPathElements(int npaths, unsigned char *paths, int *bad, Bool persist) fpe->name); } #endif /* NXAGENT_SERVER */ - xfree (fpe->name); - xfree (fpe); + free (fpe->name); + free (fpe); } } } @@ -1805,7 +1805,7 @@ bail: *bad = i; while (--valid_paths >= 0) FreeFPE(fplist[valid_paths]); - xfree(fplist); + free(fplist); return FontToXError(err); } @@ -2037,7 +2037,7 @@ FreeFonts() FreeFontPath(font_path_elements, num_fpes, TRUE); font_path_elements = 0; num_fpes = 0; - xfree(fpe_functions); + free(fpe_functions); num_fpe_types = 0; fpe_functions = (FPEFunctions *) 0; } diff --git a/nx-X11/programs/Xserver/dix/dixutils.c b/nx-X11/programs/Xserver/dix/dixutils.c index e91303851..1c6305684 100644 --- a/nx-X11/programs/Xserver/dix/dixutils.c +++ b/nx-X11/programs/Xserver/dix/dixutils.c @@ -377,7 +377,7 @@ AlterSaveSetForClient(ClientPtr client, WindowPtr pWin, unsigned mode, } else { - xfree(client->saveSet); + free(client->saveSet); client->saveSet = (SaveSetElt *)NULL; } client->numSaved = numnow; @@ -549,7 +549,7 @@ RemoveBlockAndWakeupHandlers (BlockHandlerProcPtr blockHandler, void InitBlockAndWakeupHandlers () { - xfree (handlers); + free (handlers); handlers = (BlockHandlerPtr) 0; numHandlers = 0; sizeHandlers = 0; @@ -581,7 +581,7 @@ ProcessWorkQueue(void) { /* remove q from the list */ *p = q->next; /* don't fetch until after func called */ - xfree (q); + free (q); } else { @@ -604,7 +604,7 @@ ProcessWorkQueueZombies(void) (void) (*q->function) (q->client, q->closure); /* remove q from the list */ *p = q->next; /* don't fetch until after func called */ - xfree (q); + free (q); } else { @@ -692,7 +692,7 @@ ClientWakeup (ClientPtr client) if (q->client == client) { *prev = q->next; - xfree (q); + free (q); if (client->clientGone) /* Oops -- new zombie cleanup code ensures this only * happens from inside CloseDownClient; don't want to @@ -775,7 +775,7 @@ _DeleteCallback( cbl->list = cbr->next; else pcbr->next = cbr->next; - xfree(cbr); + free(cbr); } return TRUE; } @@ -820,12 +820,12 @@ _CallCallbacks( if (pcbr) { cbr = cbr->next; - xfree(pcbr->next); + free(pcbr->next); pcbr->next = cbr; } else { cbr = cbr->next; - xfree(cbl->list); + free(cbl->list); cbl->list = cbr; } cbl->numDeleted--; @@ -865,9 +865,9 @@ _DeleteCallbackList( for (cbr = cbl->list; cbr != NULL; cbr = nextcbr) { nextcbr = cbr->next; - xfree(cbr); + free(cbr); } - xfree(cbl); + free(cbl); *pcbl = NULL; } @@ -955,7 +955,7 @@ InitCallbackManager() { DeleteCallbackList(listsToCleanup[i]); } - if (listsToCleanup) xfree(listsToCleanup); + if (listsToCleanup) free(listsToCleanup); numCallbackListsToCleanup = 0; listsToCleanup = NULL; diff --git a/nx-X11/programs/Xserver/dix/events.c b/nx-X11/programs/Xserver/dix/events.c index 31b76e38f..ba0c5d847 100644 --- a/nx-X11/programs/Xserver/dix/events.c +++ b/nx-X11/programs/Xserver/dix/events.c @@ -1076,7 +1076,7 @@ PlayReleasedEvents(void) #endif (*qe->device->public.processInputProc)(qe->event, qe->device, qe->evcount); - xfree(qe); + free(qe); for (dev = inputInfo.devices; dev && dev->sync.frozen; dev = dev->next) ; if (!dev) @@ -2959,7 +2959,7 @@ OtherClientGone(void * value, XID id) if (!(pWin->optional->otherClients = other->next)) CheckWindowOptionalNeed (pWin); } - xfree(other); + free(other); RecalculateDeliverableEvents(pWin); return(Success); } @@ -3948,7 +3948,7 @@ InitEvents() while (syncEvents.pending) { QdEventPtr next = syncEvents.pending->next; - xfree(syncEvents.pending); + free(syncEvents.pending); syncEvents.pending = next; } syncEvents.pendtail = &syncEvents.pending; @@ -3968,7 +3968,7 @@ InitEvents() void CloseDownEvents(void) { - xfree(spriteTrace); + free(spriteTrace); spriteTrace = NULL; spriteTraceSize = 0; } diff --git a/nx-X11/programs/Xserver/dix/extension.c b/nx-X11/programs/Xserver/dix/extension.c index fe51f8916..4f06c0af4 100644 --- a/nx-X11/programs/Xserver/dix/extension.c +++ b/nx-X11/programs/Xserver/dix/extension.c @@ -103,7 +103,7 @@ AddExtension(char *name, int NumEvents, int NumErrors, ext->aliases = (char **)NULL; if (!ext->name) { - xfree(ext); + free(ext); return((ExtensionEntry *) NULL); } strcpy(ext->name, name); @@ -112,8 +112,8 @@ AddExtension(char *name, int NumEvents, int NumErrors, (i + 1) * sizeof(ExtensionEntry *)); if (!newexts) { - xfree(ext->name); - xfree(ext); + free(ext->name); + free(ext); return((ExtensionEntry *) NULL); } NumExtensions++; @@ -263,13 +263,13 @@ CloseDownExtensions() if (extensions[i]->CloseDown) (* extensions[i]->CloseDown)(extensions[i]); NumExtensions = i; - xfree(extensions[i]->name); + free(extensions[i]->name); for (j = extensions[i]->num_aliases; --j >= 0;) - xfree(extensions[i]->aliases[j]); - xfree(extensions[i]->aliases); - xfree(extensions[i]); + free(extensions[i]->aliases[j]); + free(extensions[i]->aliases); + free(extensions[i]); } - xfree(extensions); + free(extensions); extensions = (ExtensionEntry **)NULL; lastEvent = EXTENSION_EVENT_BASE; lastError = FirstExtensionError; @@ -280,9 +280,9 @@ CloseDownExtensions() while (spentry->num) { spentry->num--; - xfree(spentry->procList[spentry->num].name); + free(spentry->procList[spentry->num].name); } - xfree(spentry->procList); + free(spentry->procList); spentry->procList = (ProcEntryPtr)NULL; } } @@ -446,7 +446,7 @@ RegisterScreenProc(char *name, ScreenPtr pScreen, ExtensionLookupProc proc) sizeof(ProcEntryRec) * (spentry->num+1)); if (!procEntry) { - xfree(newname); + free(newname); return FALSE; } spentry->procList = procEntry; diff --git a/nx-X11/programs/Xserver/dix/gc.c b/nx-X11/programs/Xserver/dix/gc.c index 2c17de3d6..595d8ab74 100644 --- a/nx-X11/programs/Xserver/dix/gc.c +++ b/nx-X11/programs/Xserver/dix/gc.c @@ -457,7 +457,7 @@ dixChangeGC(ClientPtr client, register GC *pGC, register BITS32 mask, CARD32 *pC { if (pGC->dash != DefaultDash) { - xfree(pGC->dash); + free(pGC->dash); pGC->numInDashList = 2; pGC->dash = DefaultDash; } @@ -470,7 +470,7 @@ dixChangeGC(ClientPtr client, register GC *pGC, register BITS32 mask, CARD32 *pC if (dash) { if (pGC->dash != DefaultDash) - xfree(pGC->dash); + free(pGC->dash); pGC->numInDashList = 2; pGC->dash = dash; dash[0] = newdash; @@ -838,7 +838,7 @@ CopyGC(register GC *pgcSrc, register GC *pgcDst, register BITS32 mask) { if (pgcDst->dash != DefaultDash) { - xfree(pgcDst->dash); + free(pgcDst->dash); pgcDst->numInDashList = pgcSrc->numInDashList; pgcDst->dash = pgcSrc->dash; } @@ -853,7 +853,7 @@ CopyGC(register GC *pgcSrc, register GC *pgcDst, register BITS32 mask) if (dash) { if (pgcDst->dash != DefaultDash) - xfree(pgcDst->dash); + free(pgcDst->dash); pgcDst->numInDashList = pgcSrc->numInDashList; pgcDst->dash = dash; for (i=0; i<pgcSrc->numInDashList; i++) @@ -904,8 +904,8 @@ FreeGC(void * value, XID gid) (*pGC->funcs->DestroyGC) (pGC); if (pGC->dash != DefaultDash) - xfree(pGC->dash); - xfree(pGC); + free(pGC->dash); + free(pGC); return(Success); } @@ -1113,7 +1113,7 @@ SetDashes(register GCPtr pGC, unsigned offset, unsigned ndash, unsigned char *pd } if (pGC->dash != DefaultDash) - xfree(pGC->dash); + free(pGC->dash); pGC->numInDashList = ndash; pGC->dash = p; if (ndash & 1) diff --git a/nx-X11/programs/Xserver/dix/glyphcurs.c b/nx-X11/programs/Xserver/dix/glyphcurs.c index f715a327f..c8b71db4e 100644 --- a/nx-X11/programs/Xserver/dix/glyphcurs.c +++ b/nx-X11/programs/Xserver/dix/glyphcurs.c @@ -108,7 +108,7 @@ ServerBitsFromGlyph(FontPtr pfont, unsigned ch, register CursorMetricPtr cm, uns (*pScreen->DestroyPixmap)(ppix); if (pGC) FreeScratchGC(pGC); - xfree(pbits); + free(pbits); return BadAlloc; } diff --git a/nx-X11/programs/Xserver/dix/grabs.c b/nx-X11/programs/Xserver/dix/grabs.c index 839e930b1..7fd9ad096 100644 --- a/nx-X11/programs/Xserver/dix/grabs.c +++ b/nx-X11/programs/Xserver/dix/grabs.c @@ -116,15 +116,15 @@ static void FreeGrab(GrabPtr pGrab) { if (pGrab->modifiersDetail.pMask != NULL) - xfree(pGrab->modifiersDetail.pMask); + free(pGrab->modifiersDetail.pMask); if (pGrab->detail.pMask != NULL) - xfree(pGrab->detail.pMask); + free(pGrab->detail.pMask); if (pGrab->cursor) FreeCursor(pGrab->cursor, (Cursor)0); - xfree(pGrab); + free(pGrab); } int @@ -410,7 +410,7 @@ DeletePassiveGrabFromList(GrabPtr pMinuendGrab) for (i = 0; i < nadds; i++) FreeResource(adds[i]->resource, RT_NONE); for (i = 0; i < nups; i++) - xfree(details[i]); + free(details[i]); } else { @@ -424,7 +424,7 @@ DeletePassiveGrabFromList(GrabPtr pMinuendGrab) } for (i = 0; i < nups; i++) { - xfree(*updates[i]); + free(*updates[i]); *updates[i] = details[i]; } } diff --git a/nx-X11/programs/Xserver/dix/main.c b/nx-X11/programs/Xserver/dix/main.c index 25fbb8b65..9d0197e3d 100644 --- a/nx-X11/programs/Xserver/dix/main.c +++ b/nx-X11/programs/Xserver/dix/main.c @@ -474,7 +474,7 @@ main(int argc, char *argv[], char *envp[]) #endif FreeAuditTimer(); - xfree(serverClient->devPrivates); + free(serverClient->devPrivates); serverClient->devPrivates = NULL; if (dispatchException & DE_TERMINATE) @@ -490,7 +490,7 @@ main(int argc, char *argv[], char *envp[]) break; } - xfree(ConnectionInfo); + free(ConnectionInfo); ConnectionInfo = NULL; } return(0); @@ -621,7 +621,7 @@ CreateConnectionBlock() pBuf = (char *)xrealloc(ConnectionInfo, lenofblock); if (!pBuf) { - xfree(ConnectionInfo); + free(ConnectionInfo); return FALSE; } ConnectionInfo = pBuf; @@ -697,7 +697,7 @@ AddScreen( screenPrivateCount); if (!pScreen->devPrivates && screenPrivateCount) { - xfree(pScreen); + free(pScreen); return -1; } pScreen->myNum = i; @@ -782,11 +782,11 @@ static void FreeScreen(ScreenPtr pScreen) { pScreen->root = NullWindow; - xfree(pScreen->WindowPrivateSizes); - xfree(pScreen->GCPrivateSizes); + free(pScreen->WindowPrivateSizes); + free(pScreen->GCPrivateSizes); #ifdef PIXPRIV - xfree(pScreen->PixmapPrivateSizes); + free(pScreen->PixmapPrivateSizes); #endif - xfree(pScreen->devPrivates); - xfree(pScreen); + free(pScreen->devPrivates); + free(pScreen); } diff --git a/nx-X11/programs/Xserver/dix/privates.c b/nx-X11/programs/Xserver/dix/privates.c index d08883d1d..3455fb21c 100644 --- a/nx-X11/programs/Xserver/dix/privates.c +++ b/nx-X11/programs/Xserver/dix/privates.c @@ -66,7 +66,7 @@ ResetClientPrivates() { clientPrivateCount = 0; clientPrivateLen = 0; - xfree(clientPrivateSizes); + free(clientPrivateSizes); clientPrivateSizes = (unsigned *)NULL; totalClientSize = ((sizeof(ClientRec) + sizeof(long) - 1) / sizeof(long)) * sizeof(long); diff --git a/nx-X11/programs/Xserver/dix/property.c b/nx-X11/programs/Xserver/dix/property.c index b3b650dda..4476141e5 100644 --- a/nx-X11/programs/Xserver/dix/property.c +++ b/nx-X11/programs/Xserver/dix/property.c @@ -290,7 +290,7 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, data = (void *)xalloc(totalSize); if (!data && len) { - xfree(pProp); + free(pProp); return(BadAlloc); } pProp->propertyName = property; @@ -353,7 +353,7 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, memmove(&((char *)data)[totalSize], (char *)pProp->data, (int)(pProp->size * sizeInBytes)); memmove((char *)data, (char *)value, totalSize); - xfree(pProp->data); + free(pProp->data); pProp->data = data; pProp->size += len; } @@ -404,8 +404,8 @@ DeleteProperty(WindowPtr pWin, Atom propName) event.u.property.atom = pProp->propertyName; event.u.property.time = currentTime.milliseconds; DeliverEvents(pWin, &event, 1, (WindowPtr)NULL); - xfree(pProp->data); - xfree(pProp); + free(pProp->data); + free(pProp); } return(Success); } @@ -426,8 +426,8 @@ DeleteAllWindowProperties(WindowPtr pWin) event.u.property.time = currentTime.milliseconds; DeliverEvents(pWin, &event, 1, (WindowPtr)NULL); pNextProp = pProp->next; - xfree(pProp->data); - xfree(pProp); + free(pProp->data); + free(pProp); pProp = pNextProp; } } @@ -599,8 +599,8 @@ ProcGetProperty(ClientPtr client) } else prevProp->next = pProp->next; - xfree(pProp->data); - xfree(pProp); + free(pProp->data); + free(pProp); } return(client->noClientException); } diff --git a/nx-X11/programs/Xserver/dix/region.c b/nx-X11/programs/Xserver/dix/region.c index e927b9fde..4c2bc4695 100644 --- a/nx-X11/programs/Xserver/dix/region.c +++ b/nx-X11/programs/Xserver/dix/region.c @@ -172,7 +172,7 @@ Equipment Corporation. ((r1)->y1 <= (r2)->y1) && \ ((r1)->y2 >= (r2)->y2) ) -#define xfreeData(reg) if ((reg)->data && (reg)->data->size) xfree((reg)->data) +#define xfreeData(reg) if ((reg)->data && (reg)->data->size) free((reg)->data) #define RECTALLOC_BAIL(pReg,n,bail) \ if (!(pReg)->data || (((pReg)->data->numRects + (n)) > (pReg)->data->size)) \ @@ -342,7 +342,7 @@ RegionDestroy(pReg) good(pReg); xfreeData(pReg); if (pReg != &RegionBrokenRegion) - xfree(pReg); + free(pReg); } Bool @@ -795,7 +795,7 @@ RegionOp( } if (oldData) - xfree(oldData); + free(oldData); if (!(numRects = newReg->data->numRects)) { @@ -1355,13 +1355,13 @@ NextRect: ; numRI -= half; } *badreg = ri[0].reg; - xfree(ri); + free(ri); good(badreg); return ret; bail: for (i = 0; i < numRI; i++) xfreeData(&ri[i].reg); - xfree (ri); + free (ri); return RegionBreak (badreg); } @@ -1443,7 +1443,7 @@ RegionFromRects(nrects, prect, ctype) } else { - xfree (pData); + free (pData); } return pRgn; } diff --git a/nx-X11/programs/Xserver/dix/resource.c b/nx-X11/programs/Xserver/dix/resource.c index b0edbb2aa..0c5b6dd29 100644 --- a/nx-X11/programs/Xserver/dix/resource.c +++ b/nx-X11/programs/Xserver/dix/resource.c @@ -231,7 +231,7 @@ InitClientResources(ClientPtr client) lastResourceClass = RC_LASTPREDEF; TypeMask = RC_LASTPREDEF - 1; if (DeleteFuncs) - xfree(DeleteFuncs); + free(DeleteFuncs); DeleteFuncs = (DeleteType *)xalloc((lastResourceType + 1) * sizeof(DeleteType)); if (!DeleteFuncs) @@ -249,7 +249,7 @@ InitClientResources(ClientPtr client) #ifdef XResExtension if(ResourceNames) - xfree(ResourceNames); + free(ResourceNames); ResourceNames = xalloc((lastResourceType + 1) * sizeof(Atom)); if(!ResourceNames) return FALSE; @@ -505,7 +505,7 @@ RebuildTable(int client) } DEALLOCATE_LOCAL(tails); clientTable[client].buckets *= 2; - xfree(clientTable[client].resources); + free(clientTable[client].resources); clientTable[client].resources = resources; } @@ -535,7 +535,7 @@ FreeResource(XID id, RESTYPE skipDeleteFuncType) elements = --*eltptr; if (rtype != skipDeleteFuncType) (*DeleteFuncs[rtype & TypeMask])(res->value, res->id); - xfree(res); + free(res); if (*eltptr != elements) prev = head; /* prev may no longer be valid */ gotOne = TRUE; @@ -568,7 +568,7 @@ FreeResourceByType(XID id, RESTYPE type, Bool skipFree) *prev = res->next; if (!skipFree) (*DeleteFuncs[type & TypeMask])(res->value, res->id); - xfree(res); + free(res); break; } else @@ -723,7 +723,7 @@ FreeClientNeverRetainResources(ClientPtr client) { *prev = this->next; (*DeleteFuncs[rtype & TypeMask])(this->value, this->id); - xfree(this); + free(this); } else prev = &this->next; @@ -767,10 +767,10 @@ FreeClientResources(ClientPtr client) RESTYPE rtype = this->type; *head = this->next; (*DeleteFuncs[rtype & TypeMask])(this->value, this->id); - xfree(this); + free(this); } } - xfree(clientTable[client->index].resources); + free(clientTable[client->index].resources); clientTable[client->index].resources = NULL; clientTable[client->index].buckets = 0; } diff --git a/nx-X11/programs/Xserver/dix/window.c b/nx-X11/programs/Xserver/dix/window.c index 708b67aa1..945dde7cf 100644 --- a/nx-X11/programs/Xserver/dix/window.c +++ b/nx-X11/programs/Xserver/dix/window.c @@ -682,7 +682,7 @@ CreateWindow(Window wid, register WindowPtr pParent, int x, int y, unsigned w, { if (!MakeWindowOptional (pWin)) { - xfree (pWin); + free (pWin); *error = BadAlloc; return NullWindow; } @@ -864,7 +864,7 @@ CrushTree(WindowPtr pWin) (*UnrealizeWindow)(pChild); } FreeWindowResources(pChild); - xfree(pChild); + free(pChild); if ( (pChild = pSib) ) break; pChild = pParent; @@ -916,7 +916,7 @@ DeleteWindow(void * value, XID wid) if (pWin->prevSib) pWin->prevSib->nextSib = pWin->nextSib; } - xfree(pWin); + free(pWin); return Success; } #endif /* NXAGENT_SERVER */ @@ -3147,7 +3147,7 @@ HandleSaveSet(register ClientPtr client) MapWindow(pWin, client); } } - xfree(client->saveSet); + free(client->saveSet); client->numSaved = 0; client->saveSet = (SaveSetElt *)NULL; } @@ -3449,8 +3449,8 @@ TileScreenSaver(int i, int kind) mskbits = (unsigned char *)xalloc( BitmapBytePad(32)*16); if (!srcbits || !mskbits) { - xfree(srcbits); - xfree(mskbits); + free(srcbits); + free(mskbits); cursor = 0; } else @@ -3471,8 +3471,8 @@ TileScreenSaver(int i, int kind) } else { - xfree (srcbits); - xfree (mskbits); + free (srcbits); + free (mskbits); } } @@ -3660,7 +3660,7 @@ DisposeWindowOptional (register WindowPtr pWin) } else pWin->cursorIsNone = TRUE; - xfree (pWin->optional); + free (pWin->optional); pWin->optional = NULL; } diff --git a/nx-X11/programs/Xserver/fb/fbcmap.c b/nx-X11/programs/Xserver/fb/fbcmap.c index a7c8ca638..9fdffdeff 100644 --- a/nx-X11/programs/Xserver/fb/fbcmap.c +++ b/nx-X11/programs/Xserver/fb/fbcmap.c @@ -491,8 +491,8 @@ fbInitVisuals (VisualPtr *visualp, visual = (VisualPtr) xalloc (nvisual * sizeof (VisualRec)); if (!depth || !visual) { - xfree (depth); - xfree (visual); + free (depth); + free (visual); return FALSE; } *depthp = depth; @@ -549,7 +549,7 @@ fbInitVisuals (VisualPtr *visualp, vid++; visual++; } - xfree (visuals); + free (visuals); } fbVisuals = NULL; visual = *visualp; diff --git a/nx-X11/programs/Xserver/fb/fbcopy.c b/nx-X11/programs/Xserver/fb/fbcopy.c index f68811ebb..d1fb63828 100644 --- a/nx-X11/programs/Xserver/fb/fbcopy.c +++ b/nx-X11/programs/Xserver/fb/fbcopy.c @@ -282,7 +282,7 @@ fbCopyNto1 (DrawablePtr pSrcDrawable, pPriv->and, pPriv->xor, pPriv->bgand, pPriv->bgxor); - xfree (tmp); + free (tmp); } pbox++; } diff --git a/nx-X11/programs/Xserver/fb/fbpixmap.c b/nx-X11/programs/Xserver/fb/fbpixmap.c index 99c03862b..c562da221 100644 --- a/nx-X11/programs/Xserver/fb/fbpixmap.c +++ b/nx-X11/programs/Xserver/fb/fbpixmap.c @@ -104,7 +104,7 @@ fbDestroyPixmap (PixmapPtr pPixmap) { if(--pPixmap->refcnt) return TRUE; - xfree(pPixmap); + free(pPixmap); return TRUE; } @@ -309,7 +309,7 @@ fbPixmapToRegion(PixmapPtr pPix) pReg->extents.y2 = RegionEnd(pReg)->y2; if (pReg->data->numRects == 1) { - xfree(pReg->data); + free(pReg->data); pReg->data = (RegDataPtr)NULL; } } diff --git a/nx-X11/programs/Xserver/fb/fbpseudocolor.c b/nx-X11/programs/Xserver/fb/fbpseudocolor.c index 51f21ed21..bc1c091ed 100644 --- a/nx-X11/programs/Xserver/fb/fbpseudocolor.c +++ b/nx-X11/programs/Xserver/fb/fbpseudocolor.c @@ -277,7 +277,7 @@ xxCreateScreenResources(ScreenPtr pScreen) pPixmap = (*pScreen->CreatePixmap)(pScreen, 0, 0, depth); if (!pPixmap) { - xfree(pBits); + free(pBits); return FALSE; } if (!(*pScreen->ModifyPixmapHeader)(pPixmap, pScreen->width, @@ -285,7 +285,7 @@ xxCreateScreenResources(ScreenPtr pScreen) BitsPerPixel(depth), PixmapBytePad(pScreen->width, depth), pBits)) { - xfree(pBits); + free(pBits); return FALSE; } if (pScreen->rootDepth == pScrPriv->myDepth) { @@ -295,7 +295,7 @@ xxCreateScreenResources(ScreenPtr pScreen) PixmapBytePad(pScreen->width, pScrPriv->depth), 0)) { - xfree(pBits); + free(pBits); return FALSE; } } @@ -328,9 +328,9 @@ xxCloseScreen (int iScreen, ScreenPtr pScreen) unwrap (pScrPriv,pScreen, CloseScreen); ret = pScreen->CloseScreen(iScreen,pScreen); - xfree(pScrPriv->pBits); - xfree(pScrPriv->InstalledCmaps); - xfree(pScrPriv); + free(pScrPriv->pBits); + free(pScrPriv->InstalledCmaps); + free(pScrPriv); return TRUE; } @@ -456,8 +456,8 @@ xxDestroyColormap(ColormapPtr pmap) tmpCmapPriv = tmpCmapPriv->next; } - xfree(pCmapPriv->cmap); - xfree(pCmapPriv); + free(pCmapPriv->cmap); + free(pCmapPriv); } unwrap(pScrPriv,pmap->pScreen, DestroyColormap); diff --git a/nx-X11/programs/Xserver/fb/fbscreen.c b/nx-X11/programs/Xserver/fb/fbscreen.c index 342fd5784..0600cebfe 100644 --- a/nx-X11/programs/Xserver/fb/fbscreen.c +++ b/nx-X11/programs/Xserver/fb/fbscreen.c @@ -36,12 +36,12 @@ fbCloseScreen (int index, ScreenPtr pScreen) DepthPtr depths = pScreen->allowedDepths; for (d = 0; d < pScreen->numDepths; d++) - xfree (depths[d].vids); - xfree (depths); - xfree (pScreen->visuals); - xfree (pScreen->devPrivate); + free (depths[d].vids); + free (depths); + free (pScreen->visuals); + free (pScreen->devPrivate); #ifdef FB_SCREEN_PRIVATE - xfree (pScreen->devPrivates[fbScreenPrivateIndex].ptr); + free (pScreen->devPrivates[fbScreenPrivateIndex].ptr); #endif return TRUE; } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index 6e6d61772..4f0173db0 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -355,7 +355,7 @@ int ddxProcessArgument(int argc, char *argv[], int i) if (nxagentOptionFile != NULL) { - xfree(nxagentOptionFile); + free(nxagentOptionFile); nxagentOptionFile = NULL; } @@ -719,7 +719,7 @@ int ddxProcessArgument(int argc, char *argv[], int i) if (nxagentKeyboard != NULL) { - xfree(nxagentKeyboard); + free(nxagentKeyboard); nxagentKeyboard = NULL; } @@ -1591,7 +1591,7 @@ nxagentProcessOptionsFileFree: if (data != NULL) { - Xfree(data); + free(data); } nxagentProcessOptionsFileClose: diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c index a0dfbf602..5249d8550 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -745,7 +745,7 @@ void nxagentCollectPropertyEvent(int resource) if (pszReturnData != NULL) { - Xfree(pszReturnData); + free(pszReturnData); } return; @@ -787,7 +787,7 @@ void nxagentCollectPropertyEvent(int resource) if (pszReturnData != NULL) { - Xfree(pszReturnData); + free(pszReturnData); } return; @@ -1487,7 +1487,7 @@ int nxagentInitClipboard(WindowPtr pWin) if (lastSelectionOwner != NULL) { - xfree(lastSelectionOwner); + free(lastSelectionOwner); lastSelectionOwner = NULL; } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Colormap.c b/nx-X11/programs/Xserver/hw/nxagent/Colormap.c index fe3b6ce1d..18c4c67a6 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Colormap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Colormap.c @@ -112,7 +112,7 @@ Bool nxagentCreateColormap(ColormapPtr pCmap) pCmap->red[i].co.local.green = colors[i].red; pCmap->red[i].co.local.blue = colors[i].red; } - xfree(colors); + free(colors); break; case StaticColor: /* read only */ @@ -125,7 +125,7 @@ Bool nxagentCreateColormap(ColormapPtr pCmap) pCmap->red[i].co.local.green = colors[i].green; pCmap->red[i].co.local.blue = colors[i].blue; } - xfree(colors); + free(colors); break; case TrueColor: /* read only */ @@ -149,7 +149,7 @@ Bool nxagentCreateColormap(ColormapPtr pCmap) pCmap->green[i].co.local.green = colors[i].green; pCmap->blue[i].co.local.blue = colors[i].blue; } - xfree(colors); + free(colors); break; case GrayScale: /* read and write */ @@ -168,7 +168,7 @@ Bool nxagentCreateColormap(ColormapPtr pCmap) void nxagentDestroyColormap(ColormapPtr pCmap) { XFreeColormap(nxagentDisplay, nxagentColormap(pCmap)); - xfree(pCmap->devPriv); + free(pCmap->devPriv); } #define SEARCH_PREDICATE \ @@ -246,11 +246,11 @@ void nxagentSetInstalledColormapWindows(ScreenPtr pScreen) numWindows = 0; } - xfree(icws.cmapIDs); + free(icws.cmapIDs); if (!nxagentSameInstalledColormapWindows(icws.windows, icws.numWindows)) { if (nxagentOldInstalledColormapWindows) - xfree(nxagentOldInstalledColormapWindows); + free(nxagentOldInstalledColormapWindows); #ifdef _XSERVER64 { @@ -261,7 +261,7 @@ void nxagentSetInstalledColormapWindows(ScreenPtr pScreen) windows[i] = icws.windows[i]; XSetWMColormapWindows(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum], windows, numWindows); - xfree(windows); + free(windows); } #else XSetWMColormapWindows(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum], @@ -310,13 +310,13 @@ void nxagentSetInstalledColormapWindows(ScreenPtr pScreen) #endif /* DUMB_WINDOW_MANAGERS */ } else - if (icws.windows) xfree(icws.windows); + if (icws.windows) free(icws.windows); } void nxagentSetScreenSaverColormapWindow(ScreenPtr pScreen) { if (nxagentOldInstalledColormapWindows) - xfree(nxagentOldInstalledColormapWindows); + free(nxagentOldInstalledColormapWindows); #ifdef _XSERVER64 { @@ -448,7 +448,7 @@ void nxagentStoreColors(ColormapPtr pCmap, int nColors, xColorItem *pColors) pColors64[i].flags = pColors[i].flags; } XStoreColors(nxagentDisplay, nxagentColormap(pCmap), pColors64, nColors); - xfree(pColors64); + free(pColors64); } #else XStoreColors(nxagentDisplay, nxagentColormap(pCmap), diff --git a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c index 62095d5b3..b1449bf13 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c @@ -267,7 +267,7 @@ Bool nxagentUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) nxagentCursor(pCursor, pScreen) = None; } - xfree(nxagentCursorPriv(pCursor, pScreen)); + free(nxagentCursorPriv(pCursor, pScreen)); return True; } @@ -366,7 +366,7 @@ void nxagentReconnectCursor(void * p0, XID x1, void * p2) } else { - xfree(nxagentCursorPriv(pCursor, nxagentDefaultScreen)); + free(nxagentCursorPriv(pCursor, nxagentDefaultScreen)); if (!nxagentRealizeCursor(nxagentDefaultScreen, pCursor)) { fprintf(stderr, "nxagentReconnectCursor: nxagentRealizeCursor failed\n"); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c index 31ea7c2a0..27cd0859a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Display.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c @@ -1814,13 +1814,13 @@ void nxagentCloseDisplay() * traffic */ - xfree(nxagentDefaultColormaps); + free(nxagentDefaultColormaps); nxagentDefaultColormaps = NULL; XFree(nxagentVisuals); nxagentVisuals = NULL; - xfree(nxagentDepths); + free(nxagentDepths); nxagentDepths = NULL; XFree(nxagentPixmapFormats); @@ -2060,7 +2060,7 @@ void nxagentBackupDisplayInfo(void) nxagentNumVisualsRecBackup = nxagentNumVisuals; if (nxagentVisualHasBeenIgnored) { - xfree(nxagentVisualHasBeenIgnored); + free(nxagentVisualHasBeenIgnored); nxagentVisualHasBeenIgnored = NULL; } nxagentVisualHasBeenIgnored = xalloc(nxagentNumVisuals * sizeof(Bool)); @@ -2074,17 +2074,17 @@ void nxagentBackupDisplayInfo(void) void nxagentCleanupBackupDisplayInfo(void) { - xfree(nxagentDepthsRecBackup); + free(nxagentDepthsRecBackup); nxagentNumDepthsRecBackup = 0; nxagentNumDefaultColormapsRecBackup = 0; - xfree(nxagentVisualsRecBackup); + free(nxagentVisualsRecBackup); nxagentNumVisualsRecBackup = 0; if (nxagentVisualHasBeenIgnored) { - xfree(nxagentVisualHasBeenIgnored); + free(nxagentVisualHasBeenIgnored); nxagentVisualHasBeenIgnored = NULL; } @@ -2107,7 +2107,7 @@ void nxagentCleanupBackupDisplayInfo(void) } else { - xfree(nxagentBitmapGCBackup); + free(nxagentBitmapGCBackup); } nxagentBitmapGCBackup = NULL; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c index 377e119ab..a73040eeb 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c @@ -359,7 +359,7 @@ nxagentSynchronizeDrawableDataFree: if (data != NULL) { - xfree(data); + free(data); } nxagentSynchronizeDrawableDataEnd: @@ -860,7 +860,7 @@ int nxagentSynchronizeRegion(DrawablePtr pDrawable, RegionPtr pRegion, unsigned if (cmpData != NULL) { - xfree(cmpData); + free(cmpData); } } } @@ -1060,7 +1060,7 @@ nxagentSynchronizeRegionFree: if (data != NULL) { - xfree(data); + free(data); } RegionUninit(&exposeRegion); @@ -2161,7 +2161,7 @@ unsigned long nxagentGetColor(DrawablePtr pDrawable, int xPixel, int yPixel) fprintf(stderr, "nxagentGetColor: WARNING! Failed to create the XImage.\n"); #endif - xfree(data); + free(data); return -1; } @@ -2387,7 +2387,7 @@ void nxagentFillRemoteRegion(DrawablePtr pDrawable, RegionPtr pRegion) XFillRectangles(nxagentDisplay, nxagentDrawable(pDrawable), nxagentGC(pGC), pRects, nrects); - xfree(pRects); + free(pRects); } } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c index 8f692eb85..22b3e6c88 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Font.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c @@ -196,11 +196,11 @@ void nxagentFreeFontCache(void) nxagentFreeFont(CACHE_FSTRUCT(i)); } - xfree(CACHE_NAME(i)); - xfree(CACHE_ENTRY(i)); + free(CACHE_NAME(i)); + free(CACHE_ENTRY(i)); } - xfree(CACHE_ENTRY_PTR); + free(CACHE_ENTRY_PTR); CACHE_ENTRY_PTR = NULL; CACHE_INDEX = 0; CACHE_SIZE = 0; @@ -364,10 +364,10 @@ static void nxagentFreeRemoteFontList(nxagentFontList *listRec) { if (listRec -> list[l]) { - xfree(listRec -> list[l] -> name); + free(listRec -> list[l] -> name); listRec -> list[l] -> name = NULL; - xfree(listRec -> list[l]); + free(listRec -> list[l]); listRec -> list[l] = NULL; } } @@ -686,7 +686,7 @@ Bool nxagentUnrealizeFont(ScreenPtr pScreen, FontPtr pFont) if (nxagentFontPriv(pFont) -> mirrorID) FreeResource(nxagentFontPriv(pFont) -> mirrorID, RT_NONE); - xfree(nxagentFontPriv(pFont)); + free(nxagentFontPriv(pFont)); FontSetPrivate(pFont, nxagentFontPrivateIndex, NULL); } @@ -1640,7 +1640,7 @@ XFontStruct* nxagentLoadQueryFont(register Display *dpy, char *name, FontPtr pFo fprintf(stderr, "nxagentLoadQueryFont: WARNING! Font not found '%s'.\n", name); #endif - Xfree(fs); + free(fs); return (XFontStruct *) NULL; } @@ -1674,7 +1674,7 @@ XFontStruct* nxagentLoadQueryFont(register Display *dpy, char *name, FontPtr pFo fprintf(stderr, "nxagentLoadQueryFont: WARNING! Failed allocation of XFontProp."); #endif - Xfree((char *) fs); + free((char *) fs); return (XFontStruct *) NULL; } @@ -1714,13 +1714,13 @@ int nxagentFreeFont(XFontStruct *fs) #ifdef USE_XF86BIGFONT _XF86BigfontFreeFontMetrics(fs); #else - Xfree ((char *) fs->per_char); + free ((char *) fs->per_char); #endif } if (fs -> properties) { - Xfree (fs->properties); + free (fs->properties); } XFree(fs); diff --git a/nx-X11/programs/Xserver/hw/nxagent/GC.c b/nx-X11/programs/Xserver/hw/nxagent/GC.c index 7450c1e6c..21e828769 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/GC.c +++ b/nx-X11/programs/Xserver/hw/nxagent/GC.c @@ -686,7 +686,7 @@ void nxagentChangeClip(GCPtr pGC, int type, void * pValue, int nRects) XSetClipRectangles(nxagentDisplay, nxagentGC(pGC), pGC -> clipOrg.x, pGC -> clipOrg.y, pRects, nRects, Unsorted); - xfree((char *) pRects); + free((char *) pRects); } break; @@ -770,7 +770,7 @@ void nxagentChangeClip(GCPtr pGC, int type, void * pValue, int nRects) pGC->clientClip = (void *) RegionFromRects(nRects, (xRectangle *)pValue, type); - xfree(pValue); + free(pValue); pValue = pGC->clientClip; @@ -904,7 +904,7 @@ static void nxagentFreeGCRec(struct nxagentGCRec *t) (void *) t, (void *) t -> gc); #endif - xfree(t -> gc); + free(t -> gc); free(t); } @@ -918,7 +918,7 @@ static void nxagentRestoreGCRec(struct nxagentGCRec *t) if (nxagentGC(t -> pGC)) { - xfree(nxagentGC(t -> pGC)); + free(nxagentGC(t -> pGC)); } nxagentGC(t -> pGC) = t -> gc; @@ -1298,7 +1298,7 @@ static void nxagentReconnectClip(GCPtr pGC, int type, void * pValue, int nRects) XSetClipRectangles(nxagentDisplay, nxagentGC(pGC), pGC -> clipOrg.x, pGC -> clipOrg.y, pRects, nRects, Unsorted); - xfree((char *) pRects); + free((char *) pRects); } else { @@ -1369,7 +1369,7 @@ static void nxagentReconnectClip(GCPtr pGC, int type, void * pValue, int nRects) pGC->clientClip = (void *) RegionFromRects(nRects, (xRectangle *)pValue, type); - xfree(pValue); + free(pValue); pValue = pGC->clientClip; type = CT_REGION; diff --git a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c index 634bbf2ce..01a3f6a93 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c +++ b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c @@ -779,7 +779,7 @@ RegionPtr nxagentCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, srcx, srcy, width, height); #endif - xfree(data); + free(data); /* * If the source is a shared memory pixmap, the @@ -999,7 +999,7 @@ RegionPtr nxagentCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, srcx, srcy, width, height); #endif - xfree(data); + free(data); /* * If the source is a shared memory pixmap, the @@ -1539,7 +1539,7 @@ void nxagentFillPolygon(DrawablePtr pDrawable, GCPtr pGC, int shape, if (newPoints != NULL) { - xfree(newPoints); + free(newPoints); } } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.c b/nx-X11/programs/Xserver/hw/nxagent/Image.c index a158a11db..b7c3135d0 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Image.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c @@ -447,7 +447,7 @@ FIXME: Here the split trap is always set and so the caching of if (nxagentUnpackAlpha[resource] != NULL) { - Xfree(nxagentUnpackAlpha[resource] -> data); + free(nxagentUnpackAlpha[resource] -> data); } else if ((nxagentUnpackAlpha[resource] = Xmalloc(sizeof(UnpackAlphaRec))) == NULL) { @@ -455,7 +455,7 @@ FIXME: Here the split trap is always set and so the caching of fprintf(stderr, "nxagentSetUnpackAlpha: PANIC! Can't allocate data for the alpha structure.\n"); #endif - Xfree(data); + free(data); return; } @@ -475,7 +475,7 @@ FIXME: Here the split trap is always set and so the caching of resource, size); #endif - Xfree(data); + free(data); } } @@ -1561,7 +1561,7 @@ nxagentPutSubImageEnd: if (packedChecksum != NULL) { - Xfree(packedChecksum); + free(packedChecksum); } if (packedImage != NULL) @@ -1569,13 +1569,13 @@ nxagentPutSubImageEnd: if (packedImage -> data != NULL && packedImage -> data != plainImage -> data) { - Xfree(packedImage -> data); + free(packedImage -> data); } - Xfree(packedImage); + free(packedImage); } - Xfree(plainImage); + free(plainImage); } void nxagentGetImage(DrawablePtr pDrawable, int x, int y, int w, int h, @@ -1629,9 +1629,9 @@ void nxagentResetAlphaCache() { if (nxagentUnpackAlpha[i]) { - Xfree(nxagentUnpackAlpha[i] -> data); + free(nxagentUnpackAlpha[i] -> data); - Xfree(nxagentUnpackAlpha[i]); + free(nxagentUnpackAlpha[i]); nxagentUnpackAlpha[i] = NULL; } @@ -1711,7 +1711,7 @@ int nxagentScaleImage(int x, int y, unsigned xRatio, unsigned yRatio, if (newImage -> data == NULL) { - Xfree(newImage); + free(newImage); #ifdef PANIC fprintf(stderr, "nxagentScaleImage: PANIC! Failed to create the target image data.\n"); @@ -1781,10 +1781,10 @@ int nxagentScaleImage(int x, int y, unsigned xRatio, unsigned yRatio, if (image -> obdata != NULL) { - Xfree((char *) image -> obdata); + free((char *) image -> obdata); } - Xfree((char *) image); + free((char *) image); *pImage = newImage; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index 852771492..6bd201d70 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -1138,7 +1138,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio #endif #ifdef _XSERVER64 - xfree(keymap); + free(keymap); #else XFree(keymap); #endif @@ -1473,17 +1473,17 @@ static int nxagentFreeKeyboardDeviceData(DeviceIntPtr dev) } #endif - xfree(dev->key->curKeySyms.map); - xfree(dev->key->modifierKeyMap); - xfree(dev->key); + free(dev->key->curKeySyms.map); + free(dev->key->modifierKeyMap); + free(dev->key); dev->key=NULL; } if (dev->focus) { - xfree(dev->focus->trace); - xfree(dev->focus); + free(dev->focus->trace); + free(dev->focus); dev->focus=NULL; } @@ -1494,7 +1494,7 @@ static int nxagentFreeKeyboardDeviceData(DeviceIntPtr dev) if (k->xkb_sli) XkbFreeSrvLedInfo(k->xkb_sli); #endif - xfree(k); + free(k); } #ifdef DEBUG diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c index b68f01b8d..d1923106d 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c @@ -197,7 +197,7 @@ void InitSelections() { if (CurrentSelections) - xfree(CurrentSelections); + free(CurrentSelections); CurrentSelections = (Selection *)NULL; NumCurrentSelections = 0; @@ -1316,7 +1316,7 @@ CloseDownClient(register ClientPtr client) #ifdef SMART_SCHEDULE SmartLastClient = NullClient; #endif - xfree(client); + free(client); while (!clients[currentMaxClients-1]) currentMaxClients--; diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c index 77f21e495..d15df9513 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c @@ -326,9 +326,9 @@ bail: for (i = 0; i < c->num_fpes; i++) { FreeFPE(c->fpe_list[i]); } - xfree(c->fpe_list); - xfree(c->fontname); - xfree(c); + free(c->fpe_list); + free(c->fontname); + free(c); return TRUE; } @@ -441,7 +441,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c) return TRUE; } if (err == FontNameAlias) { - if (resolved) xfree(resolved); + if (resolved) free(resolved); resolved = (char *) xalloc(resolvedlen + 1); if (resolved) memmove(resolved, tmpname, resolvedlen + 1); @@ -496,7 +496,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c) c->saved = c->current; c->haveSaved = TRUE; if (c->savedName) - xfree(c->savedName); + free(c->savedName); c->savedName = (char *)xalloc(namelen + 1); if (c->savedName) memmove(c->savedName, name, namelen + 1); @@ -614,11 +614,11 @@ bail: } for (i = 0; i < c->num_fpes; i++) FreeFPE(c->fpe_list[i]); - xfree(c->fpe_list); - if (c->savedName) xfree(c->savedName); + free(c->fpe_list); + if (c->savedName) free(c->savedName); FreeFontNames(names); - xfree(c); - if (resolved) xfree(resolved); + free(c); + if (resolved) free(resolved); return TRUE; } @@ -643,14 +643,14 @@ ListFonts(ClientPtr client, unsigned char *pattern, unsigned length, c->fpe_list = (FontPathElementPtr *) xalloc(sizeof(FontPathElementPtr) * num_fpes); if (!c->fpe_list) { - xfree(c); + free(c); return BadAlloc; } c->names = MakeFontNamesRecord(max_names < nxagentMaxFontNames ? max_names : nxagentMaxFontNames); if (!c->names) { - xfree(c->fpe_list); - xfree(c); + free(c->fpe_list); + free(c); return BadAlloc; } memmove( c->current.pattern, pattern, length); @@ -785,7 +785,7 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c) c->haveSaved = TRUE; c->savedNumFonts = numFonts; if (c->savedName) - xfree(c->savedName); + free(c->savedName); c->savedName = (char *)xalloc(namelen + 1); if (c->savedName) memmove(c->savedName, name, namelen + 1); @@ -886,8 +886,8 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c) (void) WriteToClient(client, namelen, name); if (pFontInfo == &fontInfo) { - xfree(fontInfo.props); - xfree(fontInfo.isStringProp); + free(fontInfo.props); + free(fontInfo.isStringProp); } --c->current.max_names; } @@ -910,10 +910,10 @@ bail: } for (i = 0; i < c->num_fpes; i++) FreeFPE(c->fpe_list[i]); - xfree(c->reply); - xfree(c->fpe_list); - if (c->savedName) xfree(c->savedName); - xfree(c); + free(c->reply); + free(c->fpe_list); + if (c->savedName) free(c->savedName); + free(c); return TRUE; } @@ -1085,7 +1085,7 @@ nxdoListFontsAndAliases(client, fss) return TRUE; } if (err == FontNameAlias) { - if (resolved) xfree(resolved); + if (resolved) free(resolved); resolved = (char *) xalloc(resolvedlen + 1); if (resolved) { @@ -1154,7 +1154,7 @@ nxdoListFontsAndAliases(client, fss) c->saved = c->current; c->haveSaved = TRUE; if (c->savedName) - xfree(c->savedName); + free(c->savedName); c->savedName = (char *)xalloc(namelen + 1); if (c->savedName) { @@ -1249,12 +1249,12 @@ finish: } for (i = 0; i < c->num_fpes; i++) FreeFPE(c->fpe_list[i]); - xfree(c->fpe_list); - if (c->savedName) xfree(c->savedName); + free(c->fpe_list); + if (c->savedName) free(c->savedName); FreeFontNames(c->names); - xfree(c); - xfree(fss); - if (resolved) xfree(resolved); + free(c); + free(fss); + if (resolved) free(resolved); return doOpenFont(client, oc); } @@ -1279,7 +1279,7 @@ nxOpenFont(client, fid, flags, lenfname, pfontname) memmove(f, pfontname, lenfname); f[lenfname] = '\0'; ErrorF("OpenFont: fontname is \"%s\"\n", f); - xfree(f); + free(f); #endif if (!lenfname || lenfname > XLFDMAXFONTNAMELEN) return BadName; @@ -1317,22 +1317,22 @@ nxOpenFont(client, fid, flags, lenfname, pfontname) if (!(c = (LFclosurePtr) xalloc(sizeof *c))) { - xfree(fss); + free(fss); return BadAlloc; } c->fpe_list = (FontPathElementPtr *) xalloc(sizeof(FontPathElementPtr) * num_fpes); if (!c->fpe_list) { - xfree(c); - xfree(fss); + free(c); + free(fss); return BadAlloc; } c->names = MakeFontNamesRecord(100); if (!c->names) { - xfree(c->fpe_list); - xfree(c); - xfree(fss); + free(c->fpe_list); + free(c); + free(fss); return BadAlloc; } memmove( c->current.pattern, pfontname, lenfname); @@ -1356,9 +1356,9 @@ nxOpenFont(client, fid, flags, lenfname, pfontname) { for (i = 0; i < c->num_fpes; i++) FreeFPE(c->fpe_list[i]); - xfree(c->fpe_list); - xfree(c); - xfree(fss); + free(c->fpe_list); + free(c); + free(fss); return BadAlloc; } oc->fontname = (char *) xalloc(256);/* I don't want to deal with future reallocs errors */ @@ -1367,10 +1367,10 @@ nxOpenFont(client, fid, flags, lenfname, pfontname) if (!oc->fontname) { for (i = 0; i < c->num_fpes; i++) FreeFPE(c->fpe_list[i]); - xfree(c->fpe_list); - xfree(c); - xfree(oc); - xfree(fss); + free(c->fpe_list); + free(c); + free(oc); + free(fss); return BadAlloc; } /* @@ -1380,13 +1380,13 @@ nxOpenFont(client, fid, flags, lenfname, pfontname) oc->fpe_list = (FontPathElementPtr *) xalloc(sizeof(FontPathElementPtr) * num_fpes); if (!oc->fpe_list) { - xfree(oc->fontname); - xfree(oc); + free(oc->fontname); + free(oc); for (i = 0; i < c->num_fpes; i++) FreeFPE(c->fpe_list[i]); - xfree(c->fpe_list); - xfree(c); - xfree(fss); + free(c->fpe_list); + free(c); + free(fss); return BadAlloc; } memmove(oc->fontname, pfontname, lenfname); diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c b/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c index 4359a552b..f2885d39c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c @@ -65,7 +65,7 @@ AddGlyph (GlyphSetPtr glyphSet, GlyphPtr glyph, Glyph id) gr = FindGlyphRef (&globalGlyphs[glyphSet->fdepth], hash, TRUE, glyph); if (gr->glyph && gr->glyph != DeletedGlyph) { - xfree (glyph); + free (glyph); glyph = gr->glyph; } else @@ -175,7 +175,7 @@ ResizeGlyphHash (GlyphHashPtr hash, CARD32 change, Bool global) ++newHash.tableEntries; } } - xfree (hash->table); + free (hash->table); } *hash = newHash; if (global) diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c b/nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c index 33492a6d6..53a5a8d68 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c @@ -115,7 +115,7 @@ ServerBitsFromGlyph(FontPtr pfont, unsigned ch, register CursorMetricPtr cm, uns fbDestroyPixmap(ppix); if (pGC) FreeScratchGC(pGC); - xfree(pbits); + free(pbits); return BadAlloc; } diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c b/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c index a47e158df..44248bc1b 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c @@ -284,7 +284,7 @@ CreateSolidPicture (Picture pid, xRenderColor *color, int *error) pPicture->pSourcePict = (SourcePictPtr) xalloc(sizeof(PictSolidFill)); if (!pPicture->pSourcePict) { *error = BadAlloc; - xfree(pPicture); + free(pPicture); return 0; } pPicture->pSourcePict->type = SourcePictTypeSolidFill; @@ -361,12 +361,12 @@ FreePicture (void * value, nxagentDestroyPicture(pPicture); if (pPicture->transform) - xfree (pPicture->transform); + free (pPicture->transform); if (!pPicture->pDrawable) { if (pPicture->pSourcePict) { if (pPicture->pSourcePict->type != SourcePictTypeSolidFill) - xfree(pPicture->pSourcePict->linear.stops); - xfree(pPicture->pSourcePict); + free(pPicture->pSourcePict->linear.stops); + free(pPicture->pSourcePict); } } else { ScreenPtr pScreen = pPicture->pDrawable->pScreen; @@ -397,7 +397,7 @@ FreePicture (void * value, (*pScreen->DestroyPixmap) ((PixmapPtr)pPicture->pDrawable); } } - xfree (pPicture); + free (pPicture); } return Success; } @@ -502,7 +502,7 @@ Bool nxagentReconnectAllPictFormat(void *p) } } - xfree(formats); + free(formats); /* TODO: Perhaps do i have to do PictureFinishInit ?. */ /* TODO: We have to check for new Render protocol version. */ diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c index 2458c12d0..0ace2fbd2 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c @@ -233,7 +233,7 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, data = (void *)xalloc(totalSize); if (!data && len) { - xfree(pProp); + free(pProp); return(BadAlloc); } pProp->propertyName = property; @@ -296,7 +296,7 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, memmove(&((char *)data)[totalSize], (char *)pProp->data, (int)(pProp->size * sizeInBytes)); memmove((char *)data, (char *)value, totalSize); - xfree(pProp->data); + free(pProp->data); pProp->data = data; pProp->size += len; } @@ -521,8 +521,8 @@ ProcGetProperty(ClientPtr client) } else prevProp->next = pProp->next; - xfree(pProp->data); - xfree(pProp); + free(pProp->data); + free(pProp); } return(client->noClientException); } @@ -636,8 +636,8 @@ GetWindowProperty(pWin, property, longOffset, longLength, delete, } else prevProp->next = pProp->next; - xfree(pProp->data); - xfree(pProp); + free(pProp->data); + free(pProp); } return(Success); } diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c index 93760f482..b89b835db 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c @@ -362,7 +362,7 @@ ProcRenderQueryPictFormats (ClientPtr client) swapl (&reply->numSubpixel, n); } WriteToClient(client, rlength, (char *) reply); - xfree (reply); + free (reply); return client->noClientException; } @@ -730,7 +730,7 @@ ProcRenderTrapezoids (ClientPtr client) if (nxagentTrapezoidExtents != NullBox) { - xfree(nxagentTrapezoidExtents); + free(nxagentTrapezoidExtents); nxagentTrapezoidExtents = NullBox; } @@ -1132,7 +1132,7 @@ ProcRenderCompositeGlyphs (ClientPtr client) glyphsBase); } - xfree(nxagentGlyphsExtents); + free(nxagentGlyphsExtents); nxagentGlyphsExtents = NullBox; if (glyphsBase != glyphsLocal) @@ -1140,7 +1140,7 @@ ProcRenderCompositeGlyphs (ClientPtr client) if (listsBase != listsLocal) DEALLOCATE_LOCAL (listsBase); - xfree(elementsBase); + free(elementsBase); return client->noClientException; } @@ -1228,14 +1228,14 @@ ProcRenderCreateCursor (ClientPtr client) srcbits = (unsigned char *)xalloc(nbytes_mono); if (!srcbits) { - xfree (argbbits); + free (argbbits); return (BadAlloc); } mskbits = (unsigned char *)xalloc(nbytes_mono); if (!mskbits) { - xfree(argbbits); - xfree(srcbits); + free(argbbits); + free(srcbits); return (BadAlloc); } bzero ((char *) mskbits, nbytes_mono); @@ -1257,26 +1257,26 @@ ProcRenderCreateCursor (ClientPtr client) pFormat = PictureMatchFormat (pScreen, 32, PICT_a8r8g8b8); if (!pFormat) { - xfree (argbbits); - xfree (srcbits); - xfree (mskbits); + free (argbbits); + free (srcbits); + free (mskbits); return (BadImplementation); } pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height, 32); if (!pPixmap) { - xfree (argbbits); - xfree (srcbits); - xfree (mskbits); + free (argbbits); + free (srcbits); + free (mskbits); return (BadAlloc); } pPicture = CreatePicture (0, &pPixmap->drawable, pFormat, 0, 0, client, &error); if (!pPicture) { - xfree (argbbits); - xfree (srcbits); - xfree (mskbits); + free (argbbits); + free (srcbits); + free (mskbits); return error; } (*pScreen->DestroyPixmap) (pPixmap); @@ -1360,7 +1360,7 @@ ProcRenderCreateCursor (ClientPtr client) } else { - xfree (argbbits); + free (argbbits); argbbits = 0; } @@ -1488,7 +1488,7 @@ ProcRenderCreateAnimCursor (ClientPtr client) RT_CURSOR, SecurityReadAccess); if (!cursors[i]) { - xfree (cursors); + free (cursors); client->errorValue = elt->cursor; return BadCursor; } @@ -1496,7 +1496,7 @@ ProcRenderCreateAnimCursor (ClientPtr client) elt++; } ret = AnimCursorCreate (cursors, deltas, ncursor, &pCursor); - xfree (cursors); + free (cursors); if (ret != Success) return ret; diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXresource.c b/nx-X11/programs/Xserver/hw/nxagent/NXresource.c index 38bc05e51..4226a4435 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXresource.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXresource.c @@ -313,7 +313,7 @@ FreeResource(XID id, RESTYPE skipDeleteFuncType) #endif if (rtype != skipDeleteFuncType) (*DeleteFuncs[rtype & TypeMask])(res->value, res->id); - xfree(res); + free(res); if (*eltptr != elements) prev = head; /* prev may no longer be valid */ gotOne = TRUE; @@ -349,7 +349,7 @@ FreeResourceByType(XID id, RESTYPE type, Bool skipFree) #endif if (!skipFree) (*DeleteFuncs[type & TypeMask])(res->value, res->id); - xfree(res); + free(res); break; } else diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c index 1ce72cbbe..08237440f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c @@ -239,7 +239,7 @@ fbShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data) fbGetImage((DrawablePtr) pPixmap, sx, sy, sw, sh, format, AllPlanes, newdata); (*pGC->ops->PutImage)(dst, pGC, depth, dx, dy, sw, sh, 0, format, newdata); - xfree(newdata); + free(newdata); } else { diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c index 28aafd644..0071a15d0 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c @@ -336,7 +336,7 @@ DeleteWindow(void * value, XID wid) nxagentSetInstalledColormapWindows(pWin -> drawable.pScreen); } - xfree(pWin); + free(pWin); return Success; } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c index f429f1499..0eabf1262 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c @@ -487,7 +487,7 @@ Bool nxagentDestroyPixmap(PixmapPtr pPixmap) FreeResource(pPixmapPriv -> mid, RT_NONE); } - xfree(pPixmap); + free(pPixmap); return True; } @@ -1259,7 +1259,7 @@ void nxagentSynchronizeShmPixmap(DrawablePtr pDrawable, int xPict, int yPict, nxagentPutImage(pDrawable, pGC, depth, xPict, yPict, width, height, 0, format, data); - xfree(data); + free(data); } #ifdef WARNING else @@ -1409,7 +1409,7 @@ FIXME: If the pixmap has a different depth from the window, the if (data != NULL) { - xfree(data); + free(data); } return False; @@ -1571,7 +1571,7 @@ Bool nxagentFbOnShadowDisplay() if (data) { - xfree(data); + free(data); } return False; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c index 00d434bf4..587e9a564 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c @@ -444,7 +444,7 @@ Bool nxagentReconnectSession(void) if (nxagentKeyboard) { - xfree(nxagentKeyboard); + free(nxagentKeyboard); nxagentKeyboard = NULL; } @@ -609,7 +609,7 @@ Bool nxagentReconnectSession(void) if (nxagentOldKeyboard != NULL) { - xfree(nxagentOldKeyboard); + free(nxagentOldKeyboard); nxagentOldKeyboard = NULL; } @@ -734,7 +734,7 @@ nxagentReconnectError: if (nxagentOldKeyboard != NULL) { - xfree(nxagentOldKeyboard); + free(nxagentOldKeyboard); nxagentOldKeyboard = NULL; } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c index 8c822319d..36ce6a74f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Render.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c @@ -2284,7 +2284,7 @@ void nxagentAddGlyphs(GlyphSetPtr glyphSet, Glyph *gids, xGlyphInfo *gi, if (normalizedImages != images) { - xfree(normalizedImages); + free(normalizedImages); } #ifdef DEBUG @@ -2392,7 +2392,7 @@ FIXME: Is this useful or just a waste of bandwidth? nparams); #endif - Xfree(szFilter); + free(szFilter); } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c index 49877f9d7..6947371ff 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c @@ -389,7 +389,7 @@ void nxagentRootlessRestack(unsigned long children[], unsigned int nchildren) #endif - xfree(toplevel); + free(toplevel); return; } @@ -797,7 +797,7 @@ int nxagentExportProperty(pWin, property, type, format, mode, nUnits, value) if (freeMem) { - xfree(output); + free(output); } return export; @@ -1104,7 +1104,7 @@ void nxagentImportProperty(Window window, if (freeMem) { - xfree(output); + free(output); } return; @@ -1156,7 +1156,7 @@ void nxagentRemovePropertyFromList() nxagentPropertyList.last = NULL; } - xfree(tmp); + free(tmp); } } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index de8c97532..a4c6fc2db 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -1358,8 +1358,8 @@ Bool nxagentOpenScreen(int index, ScreenPtr pScreen, * by fbScreenInit with our own. */ - xfree(pScreen -> visuals); - xfree(pScreen -> allowedDepths); + free(pScreen -> visuals); + free(pScreen -> allowedDepths); pScreen -> visuals = visuals; pScreen -> allowedDepths = depths; @@ -2079,18 +2079,18 @@ Bool nxagentCloseScreen(int index, ScreenPtr pScreen) for (i = 0; i < pScreen->numDepths; i++) { - xfree(pScreen->allowedDepths[i].vids); + free(pScreen->allowedDepths[i].vids); } /* * Free the frame buffer. */ - xfree(((PixmapPtr)pScreen -> devPrivate) -> devPrivate.ptr); + free(((PixmapPtr)pScreen -> devPrivate) -> devPrivate.ptr); - xfree(pScreen->allowedDepths); - xfree(pScreen->visuals); - xfree(pScreen->devPrivate); + free(pScreen->allowedDepths); + free(pScreen->visuals); + free(pScreen->devPrivate); /* * Reset the geometry and alpha information @@ -3065,7 +3065,7 @@ int nxagentShadowPoll(PixmapPtr nxagentShadowPixmapPtr, GCPtr nxagentShadowGCPtr if (tBuffer) { - xfree(tBuffer); + free(tBuffer); } tBuffer = xalloc(length); @@ -3125,7 +3125,7 @@ int nxagentShadowPoll(PixmapPtr nxagentShadowPixmapPtr, GCPtr nxagentShadowGCPtr if (tBuffer) { - xfree(tBuffer); + free(tBuffer); } RegionUninit(&updateRegion); @@ -3346,7 +3346,7 @@ void nxagentShadowAdaptDepth(unsigned int width, unsigned int height, if (cBuffer != NULL) { - xfree(cBuffer); + free(cBuffer); } } @@ -3529,7 +3529,7 @@ FIXME: The port information is not used at the moment and produces a strlen(local_buf), local_buf, 1); } - xfree(local_buf); + free(local_buf); } } } @@ -3769,7 +3769,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen) number = 1; if (screeninfo) { - xfree(screeninfo); + free(screeninfo); } if (!(screeninfo = xalloc(sizeof(XineramaScreenInfo)))) { return FALSE; @@ -4061,7 +4061,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen) /* release allocated memory */ if (screeninfo) { - xfree(screeninfo); + free(screeninfo); screeninfo = NULL; } @@ -4170,7 +4170,7 @@ void nxagentSaveAreas(PixmapPtr pPixmap, RegionPtr prgnSave, int xorg, int yorg, XSetClipRectangles(nxagentDisplay, gc, 0, 0, pRects, nRects, Unsorted); - xfree((char *) pRects); + free((char *) pRects); extents = *RegionExtents(&cleanRegion); @@ -4316,7 +4316,7 @@ void nxagentRestoreAreas(PixmapPtr pPixmap, RegionPtr prgnRestore, int xorg, XSetClipRectangles(nxagentDisplay, gc, 0, 0, pRects, nRects, Unsorted); - xfree(pRects); + free(pRects); extents = *RegionExtents(clipRegion); @@ -4537,7 +4537,7 @@ FIXME if (data) { - xfree(data); + free(data); } return; @@ -4573,7 +4573,7 @@ FIXME if (data != NULL) { - xfree(data); + free(data); } /* @@ -4628,7 +4628,7 @@ void nxagentFbRestoreArea(PixmapPtr pPixmap, WindowPtr pWin, int xSrc, int ySrc, if (data) { - xfree(data); + free(data); } return; @@ -4691,7 +4691,7 @@ FIXME FIXME if (data) { - xfree(data); + free(data); } */ } diff --git a/nx-X11/programs/Xserver/include/os.h b/nx-X11/programs/Xserver/include/os.h index aff2952fa..3b6a40b46 100644 --- a/nx-X11/programs/Xserver/include/os.h +++ b/nx-X11/programs/Xserver/include/os.h @@ -53,7 +53,7 @@ SOFTWARE. #include "misc.h" #define ALLOCATE_LOCAL_FALLBACK(_size) Xalloc((unsigned long)(_size)) -#define DEALLOCATE_LOCAL_FALLBACK(_ptr) Xfree((void *)(_ptr)) +#define DEALLOCATE_LOCAL_FALLBACK(_ptr) free((void *)(_ptr)) #include <nx-X11/Xalloca.h> #ifndef IN_MODULE #include <stdarg.h> diff --git a/nx-X11/programs/Xserver/mi/miarc.c b/nx-X11/programs/Xserver/mi/miarc.c index 8db188a6e..b268c1140 100644 --- a/nx-X11/programs/Xserver/mi/miarc.c +++ b/nx-X11/programs/Xserver/mi/miarc.c @@ -450,7 +450,7 @@ miFreeArcCache (data, id) { cent->lrustamp = 0; cent->lw = 0; - xfree(cent->spdata); + free(cent->spdata); cent->spdata = NULL; } } @@ -911,7 +911,7 @@ miComputeWideEllipse( if (!spdata || spdata->k != k) { if (spdata) - xfree(spdata); + free(spdata); spdata = (miArcSpanData *)xalloc(sizeof(miArcSpanData) + sizeof(miArcSpan) * (k + 2)); lruent->spdata = spdata; @@ -1054,7 +1054,7 @@ miFillWideEllipse( } } if (mustFree) - xfree(spdata); + free(spdata); (*pGC->ops->FillSpans)(pDraw, pGC, pts - points, points, widths, FALSE); DEALLOCATE_LOCAL(widths); @@ -1412,7 +1412,7 @@ miArcJoin(DrawablePtr pDraw, GCPtr pGC, miArcFacePtr pLeft, * rest of the line */ miFillSppPoly(pDraw, pGC, cpt, pArcPts, xOrg, yOrg, xFtrans, yFtrans); } - xfree(pArcPts); + free(pArcPts); return; case JoinMiter: /* @@ -1543,7 +1543,7 @@ miRoundCap( * rest of the line */ miFillSppPoly(pDraw, pGC, cpt, pArcPts, -xOrg, -yOrg, xFtrans, yFtrans); } - xfree(pArcPts); + free(pArcPts); } /* @@ -1840,13 +1840,13 @@ miFreeArcs( iphase--) { if (arcs[iphase].narcs > 0) - xfree(arcs[iphase].arcs); + free(arcs[iphase].arcs); if (arcs[iphase].njoins > 0) - xfree(arcs[iphase].joins); + free(arcs[iphase].joins); if (arcs[iphase].ncaps > 0) - xfree(arcs[iphase].caps); + free(arcs[iphase].caps); } - xfree(arcs); + free(arcs); } /* @@ -3169,11 +3169,11 @@ disposeFinalSpans (void) for (chunk = chunks; chunk; chunk = next) { next = chunk->next; - xfree (chunk); + free (chunk); } chunks = 0; freeFinalSpans = 0; - xfree(finalSpans); + free(finalSpans); finalSpans = 0; } @@ -3265,7 +3265,7 @@ realFindSpan (int y) memmove(((char *) newSpans) + (finalMiny-newMiny) * sizeof (struct finalSpan *), (char *) finalSpans, finalSize * sizeof (struct finalSpan *)); - xfree (finalSpans); + free (finalSpans); } if ((i = finalMiny - newMiny) > 0) bzero ((char *)newSpans, i * sizeof (struct finalSpan *)); @@ -3610,7 +3610,7 @@ drawArc ( } } if (mustFree) - xfree(spdata); + free(spdata); } static void diff --git a/nx-X11/programs/Xserver/mi/mibank.c b/nx-X11/programs/Xserver/mi/mibank.c index b607af1c1..754b0916f 100644 --- a/nx-X11/programs/Xserver/mi/mibank.c +++ b/nx-X11/programs/Xserver/mi/mibank.c @@ -1709,7 +1709,7 @@ miBankCloseScreen( if (pScreenPriv->pBanks[i]) RegionDestroy(pScreenPriv->pBanks[i]); - Xfree(pScreenPriv->pBanks); + free(pScreenPriv->pBanks); SCREEN_UNWRAP(CreateScreenResources); SCREEN_UNWRAP(ModifyPixmapHeader); @@ -1722,7 +1722,7 @@ miBankCloseScreen( SCREEN_UNWRAP(CopyWindow); SCREEN_UNWRAP(BackingStoreFuncs); - Xfree(pScreenPriv); + free(pScreenPriv); return (*pScreen->CloseScreen)(nIndex, pScreen); } @@ -2249,7 +2249,7 @@ miInitializeBanking( if (!(pScreenPriv->pBanks = /* Allocate and clear */ (RegionPtr *)Xcalloc(nBanks * sizeof(RegionPtr)))) { - Xfree(pScreenPriv); + free(pScreenPriv); return FALSE; } @@ -2360,8 +2360,8 @@ miInitializeBanking( if (pScreenPriv->pBanks[i]) RegionDestroy(pScreenPriv->pBanks[i]); - Xfree(pScreenPriv->pBanks); - Xfree(pScreenPriv); + free(pScreenPriv->pBanks); + free(pScreenPriv); return FALSE; } diff --git a/nx-X11/programs/Xserver/mi/mibitblt.c b/nx-X11/programs/Xserver/mi/mibitblt.c index b19a15900..ae30d5238 100644 --- a/nx-X11/programs/Xserver/mi/mibitblt.c +++ b/nx-X11/programs/Xserver/mi/mibitblt.c @@ -258,7 +258,7 @@ miCopyArea(pSrcDrawable, pDstDrawable, (*pGC->ops->SetSpans)(pDstDrawable, pGC, (char *)pbits, pptFirst, (int *)pwidthFirst, height, TRUE); - xfree(pbits); + free(pbits); } } prgnExposed = miHandleExposures(pSrcDrawable, pDstDrawable, pGC, xIn, yIn, @@ -622,7 +622,7 @@ miCopyPlane(pSrcDrawable, pDstDrawable, miOpqStipDrawable(pDstDrawable, pGC, prgnSrc, ptile, 0, box.x2 - box.x1, box.y2 - box.y1, dstx + box.x1 - srcx, dsty + box.y1 - srcy); - xfree(ptile); + free(ptile); } } prgnExposed = miHandleExposures(pSrcDrawable, pDstDrawable, pGC, srcx, srcy, diff --git a/nx-X11/programs/Xserver/mi/mibstore.c b/nx-X11/programs/Xserver/mi/mibstore.c index a24e2cbcd..d3dc11603 100644 --- a/nx-X11/programs/Xserver/mi/mibstore.c +++ b/nx-X11/programs/Xserver/mi/mibstore.c @@ -433,7 +433,7 @@ miBSCloseScreen (i, pScreen) pScreen->ChangeWindowAttributes = pScreenPriv->ChangeWindowAttributes; pScreen->CreateGC = pScreenPriv->CreateGC; - xfree ((void *) pScreenPriv); + free ((void *) pScreenPriv); return (*pScreen->CloseScreen) (i, pScreen); } @@ -931,7 +931,7 @@ miBSDestroyGCPrivate (GCPtr pGC) pGC->ops = pPriv->wrapOps; if (pPriv->pBackingGC) FreeGC (pPriv->pBackingGC, (GContext) 0); - xfree ((void *) pPriv); + free ((void *) pPriv); } } @@ -2685,7 +2685,7 @@ miBSFree(pWin) RegionUninit(&pBackingStore->SavedRegion); - xfree(pBackingStore); + free(pBackingStore); pWin->backStorage = NULL; } } @@ -3615,7 +3615,7 @@ miBSDestroyGC (pGC) FUNC_EPILOGUE (pGC, pPriv); - xfree(pPriv); + free(pPriv); } static void diff --git a/nx-X11/programs/Xserver/mi/micmap.c b/nx-X11/programs/Xserver/mi/micmap.c index 15d3f7f46..607ecec3b 100644 --- a/nx-X11/programs/Xserver/mi/micmap.c +++ b/nx-X11/programs/Xserver/mi/micmap.c @@ -393,7 +393,7 @@ miClearVisualTypes() while ((v = miVisuals)) { miVisuals = v->next; - xfree(v); + free(v); } } @@ -565,9 +565,9 @@ miDoInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp, preferredCVCs = (int *)xalloc(ndepth * sizeof(int)); if (!depth || !visual || !preferredCVCs) { - xfree (depth); - xfree (visual); - xfree (preferredCVCs); + free (depth); + free (visual); + free (preferredCVCs); return FALSE; } *depthp = depth; @@ -628,7 +628,7 @@ miDoInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp, vid++; visual++; } - xfree (visuals); + free (visuals); } miVisuals = NULL; visual = *visualp; @@ -684,7 +684,7 @@ miDoInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp, } *rootDepthp = depth[i].depth; *defaultVisp = depth[i].vids[j]; - xfree(preferredCVCs); + free(preferredCVCs); return TRUE; } diff --git a/nx-X11/programs/Xserver/mi/midash.c b/nx-X11/programs/Xserver/mi/midash.c index 5def4d9c8..2cf2704ea 100644 --- a/nx-X11/programs/Xserver/mi/midash.c +++ b/nx-X11/programs/Xserver/mi/midash.c @@ -269,7 +269,7 @@ CheckDashStorage( (*pnsegMax)*sizeof(miDashRec)); if (!newppseg) { - xfree(*ppseg); + free(*ppseg); return (miDashPtr)NULL; } *ppseg = newppseg; diff --git a/nx-X11/programs/Xserver/mi/midispcur.c b/nx-X11/programs/Xserver/mi/midispcur.c index 6ffb9efea..5d4b3023a 100644 --- a/nx-X11/programs/Xserver/mi/midispcur.c +++ b/nx-X11/programs/Xserver/mi/midispcur.c @@ -155,7 +155,7 @@ miDCInitialize (pScreen, screenFuncs) if (!miSpriteInitialize (pScreen, &miDCFuncs, screenFuncs)) { - xfree ((void *) pScreenPriv); + free ((void *) pScreenPriv); return FALSE; } return TRUE; @@ -187,7 +187,7 @@ miDCCloseScreen (index, pScreen) tossPict (pScreenPriv->pRootPicture); tossPict (pScreenPriv->pTempPicture); #endif - xfree ((void *) pScreenPriv); + free ((void *) pScreenPriv); return (*pScreen->CloseScreen) (index, pScreen); } @@ -263,7 +263,7 @@ miDCRealize ( pFormat = PictureMatchFormat (pScreen, 32, PICT_a8r8g8b8); if (!pFormat) { - xfree ((void *) pPriv); + free ((void *) pPriv); return (miDCCursorPtr)NULL; } @@ -273,14 +273,14 @@ miDCRealize ( pCursor->bits->height, 32); if (!pPixmap) { - xfree ((void *) pPriv); + free ((void *) pPriv); return (miDCCursorPtr)NULL; } pGC = GetScratchGC (32, pScreen); if (!pGC) { (*pScreen->DestroyPixmap) (pPixmap); - xfree ((void *) pPriv); + free ((void *) pPriv); return (miDCCursorPtr)NULL; } ValidateGC (&pPixmap->drawable, pGC); @@ -294,7 +294,7 @@ miDCRealize ( (*pScreen->DestroyPixmap) (pPixmap); if (!pPriv->pPicture) { - xfree ((void *) pPriv); + free ((void *) pPriv); return (miDCCursorPtr)NULL; } pCursor->bits->devPriv[pScreen->myNum] = (void *) pPriv; @@ -305,14 +305,14 @@ miDCRealize ( pPriv->sourceBits = (*pScreen->CreatePixmap) (pScreen, pCursor->bits->width, pCursor->bits->height, 1); if (!pPriv->sourceBits) { - xfree ((void *) pPriv); + free ((void *) pPriv); return (miDCCursorPtr)NULL; } pPriv->maskBits = (*pScreen->CreatePixmap) (pScreen, pCursor->bits->width, pCursor->bits->height, 1); if (!pPriv->maskBits) { (*pScreen->DestroyPixmap) (pPriv->sourceBits); - xfree ((void *) pPriv); + free ((void *) pPriv); return (miDCCursorPtr)NULL; } pCursor->bits->devPriv[pScreen->myNum] = (void *) pPriv; @@ -372,7 +372,7 @@ miDCUnrealizeCursor (pScreen, pCursor) if (pPriv->pPicture) FreePicture (pPriv->pPicture, 0); #endif - xfree ((void *) pPriv); + free ((void *) pPriv); pCursor->bits->devPriv[pScreen->myNum] = (void *)NULL; } return TRUE; diff --git a/nx-X11/programs/Xserver/mi/migc.c b/nx-X11/programs/Xserver/mi/migc.c index 167163686..0ca7872a3 100644 --- a/nx-X11/programs/Xserver/mi/migc.c +++ b/nx-X11/programs/Xserver/mi/migc.c @@ -85,7 +85,7 @@ miDestroyGCOps(ops) GCOpsPtr ops; { if (ops->devPrivate.val) - xfree(ops); + free(ops); } @@ -136,7 +136,7 @@ miChangeClip(pGC, type, pvalue, nrects) pGC->clientClip = (void *) RegionFromRects(nrects, (xRectangle *) pvalue, type); - xfree(pvalue); + free(pvalue); } pGC->clientClipType = (type != CT_NONE && pGC->clientClip) ? CT_REGION : CT_NONE; pGC->stateChanges |= GCClipMask; diff --git a/nx-X11/programs/Xserver/mi/mioverlay.c b/nx-X11/programs/Xserver/mi/mioverlay.c index e89ce8fa0..1c0402892 100644 --- a/nx-X11/programs/Xserver/mi/mioverlay.c +++ b/nx-X11/programs/Xserver/mi/mioverlay.c @@ -178,7 +178,7 @@ miOverlayCloseScreen(int i, ScreenPtr pScreen) pScreen->UnrealizeWindow = pScreenPriv->UnrealizeWindow; pScreen->RealizeWindow = pScreenPriv->RealizeWindow; - xfree(pScreenPriv); + free(pScreenPriv); return (*pScreen->CloseScreen)(i, pScreen); } @@ -224,7 +224,7 @@ miOverlayCreateWindow(WindowPtr pWin) RegionInit(&(pTree->borderClip), &fullBox, 1); RegionInit(&(pTree->clipList), &fullBox, 1); } - } else xfree(pTree); + } else free(pTree); } return TRUE; @@ -252,7 +252,7 @@ miOverlayDestroyWindow(WindowPtr pWin) RegionUninit(&(pTree->borderClip)); RegionUninit(&(pTree->clipList)); - xfree(pTree); + free(pTree); } if(pScreenPriv->DestroyWindow) { @@ -874,7 +874,7 @@ miOverlayHandleExposures(WindowPtr pWin) (*WindowExposures)(pTree->pWin,&mival->exposed,NullRegion); RegionUninit(&mival->exposed); } - xfree(mival); + free(mival); pTree->valdata = NULL; if (pTree->firstChild) { pTree = pTree->firstChild; @@ -912,7 +912,7 @@ miOverlayHandleExposures(WindowPtr pWin) } RegionUninit(&val->after.borderExposed); RegionUninit(&val->after.exposed); - xfree(val); + free(val); pChild->valdata = (ValidatePtr)NULL; if (pChild->firstChild) { diff --git a/nx-X11/programs/Xserver/mi/mipointer.c b/nx-X11/programs/Xserver/mi/mipointer.c index 0320a5930..48da4b6c3 100644 --- a/nx-X11/programs/Xserver/mi/mipointer.c +++ b/nx-X11/programs/Xserver/mi/mipointer.c @@ -146,7 +146,7 @@ miPointerCloseScreen (index, pScreen) if (pScreen == miPointer.pSpriteScreen) miPointer.pSpriteScreen = 0; pScreen->CloseScreen = pScreenPriv->CloseScreen; - xfree ((void *) pScreenPriv); + free ((void *) pScreenPriv); return (*pScreen->CloseScreen) (index, pScreen); } diff --git a/nx-X11/programs/Xserver/mi/mipolyutil.c b/nx-X11/programs/Xserver/mi/mipolyutil.c index be62250ee..7a9794fe3 100644 --- a/nx-X11/programs/Xserver/mi/mipolyutil.c +++ b/nx-X11/programs/Xserver/mi/mipolyutil.c @@ -395,7 +395,7 @@ miFreeStorage(pSLLBlock) while (pSLLBlock) { tmpSLLBlock = pSLLBlock->next; - xfree(pSLLBlock); + free(pSLLBlock); pSLLBlock = tmpSLLBlock; } } diff --git a/nx-X11/programs/Xserver/mi/mipushpxl.c b/nx-X11/programs/Xserver/mi/mipushpxl.c index 44834db50..83821b266 100644 --- a/nx-X11/programs/Xserver/mi/mipushpxl.c +++ b/nx-X11/programs/Xserver/mi/mipushpxl.c @@ -252,7 +252,7 @@ miPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg) } } } - xfree(pwLineStart); + free(pwLineStart); /* Flush any remaining spans */ if (ipt) { diff --git a/nx-X11/programs/Xserver/mi/miscrinit.c b/nx-X11/programs/Xserver/mi/miscrinit.c index da80932ad..c0df4a072 100644 --- a/nx-X11/programs/Xserver/mi/miscrinit.c +++ b/nx-X11/programs/Xserver/mi/miscrinit.c @@ -180,7 +180,7 @@ miCreateScreenResources(pScreen) { value = pScrInitParms->pbits; } - xfree(pScreen->devPrivate); /* freeing miScreenInitParmsRec */ + free(pScreen->devPrivate); /* freeing miScreenInitParmsRec */ pScreen->devPrivate = value; /* pPixmap or pbits */ return TRUE; } diff --git a/nx-X11/programs/Xserver/mi/mispans.c b/nx-X11/programs/Xserver/mi/mispans.c index 48252f323..107476df3 100644 --- a/nx-X11/programs/Xserver/mi/mispans.c +++ b/nx-X11/programs/Xserver/mi/mispans.c @@ -216,15 +216,15 @@ void miAppendSpans(spanGroup, otherGroup, spans) } else { - xfree (spans->points); - xfree (spans->widths); + free (spans->points); + free (spans->widths); } } /* AppendSpans */ void miFreeSpanGroup(spanGroup) SpanGroup *spanGroup; { - if (spanGroup->group != NULL) xfree(spanGroup->group); + if (spanGroup->group != NULL) free(spanGroup->group); } static void QuickSortSpansX( @@ -376,8 +376,8 @@ miDisposeSpanGroup (spanGroup) for (i = 0; i < spanGroup->count; i++) { spans = spanGroup->group + i; - xfree (spans->points); - xfree (spans->widths); + free (spans->points); + free (spans->widths); } } @@ -404,8 +404,8 @@ void miFillUniqueSpanGroup(pDraw, pGC, spanGroup) spans = spanGroup->group; (*pGC->ops->FillSpans) (pDraw, pGC, spans->count, spans->points, spans->widths, TRUE); - xfree(spans->points); - xfree(spans->widths); + free(spans->points); + free(spans->widths); } else { @@ -424,9 +424,9 @@ void miFillUniqueSpanGroup(pDraw, pGC, spanGroup) if (!yspans || !ysizes) { if (yspans) - xfree (yspans); + free (yspans); if (ysizes) - xfree (ysizes); + free (ysizes); miDisposeSpanGroup (spanGroup); return; } @@ -468,11 +468,11 @@ void miFillUniqueSpanGroup(pDraw, pGC, spanGroup) for (i = 0; i < ylength; i++) { - xfree (yspans[i].points); - xfree (yspans[i].widths); + free (yspans[i].points); + free (yspans[i].widths); } - xfree (yspans); - xfree (ysizes); + free (yspans); + free (ysizes); miDisposeSpanGroup (spanGroup); return; } @@ -485,9 +485,9 @@ void miFillUniqueSpanGroup(pDraw, pGC, spanGroup) } /* if y value of span in range */ } /* for j through spans */ count += spans->count; - xfree(spans->points); + free(spans->points); spans->points = NULL; - xfree(spans->widths); + free(spans->widths); spans->widths = NULL; } /* for i thorough Spans */ @@ -500,15 +500,15 @@ void miFillUniqueSpanGroup(pDraw, pGC, spanGroup) for (i = 0; i < ylength; i++) { - xfree (yspans[i].points); - xfree (yspans[i].widths); + free (yspans[i].points); + free (yspans[i].widths); } - xfree (yspans); - xfree (ysizes); + free (yspans); + free (ysizes); if (points) - xfree (points); + free (points); if (widths) - xfree (widths); + free (widths); return; } count = 0; @@ -524,16 +524,16 @@ void miFillUniqueSpanGroup(pDraw, pGC, spanGroup) widths[count] = yspans[i].widths[0]; count++; } - xfree(yspans[i].points); - xfree(yspans[i].widths); + free(yspans[i].points); + free(yspans[i].widths); } } (*pGC->ops->FillSpans) (pDraw, pGC, count, points, widths, TRUE); - xfree(points); - xfree(widths); - xfree(yspans); - xfree(ysizes); /* use (DE)ALLOCATE_LOCAL for these? */ + free(points); + free(widths); + free(yspans); + free(ysizes); /* use (DE)ALLOCATE_LOCAL for these? */ } spanGroup->count = 0; @@ -553,8 +553,8 @@ void miFillSpanGroup(pDraw, pGC, spanGroup) for (i = 0, spans = spanGroup->group; i != spanGroup->count; i++, spans++) { (*pGC->ops->FillSpans) (pDraw, pGC, spans->count, spans->points, spans->widths, TRUE); - xfree(spans->points); - xfree(spans->widths); + free(spans->points); + free(spans->widths); } spanGroup->count = 0; diff --git a/nx-X11/programs/Xserver/mi/misprite.c b/nx-X11/programs/Xserver/mi/misprite.c index c854984fc..2b68ad76a 100644 --- a/nx-X11/programs/Xserver/mi/misprite.c +++ b/nx-X11/programs/Xserver/mi/misprite.c @@ -182,7 +182,7 @@ miSpriteInitialize (pScreen, cursorFuncs, screenFuncs) if (!miPointerInitialize (pScreen, &miSpritePointerFuncs, screenFuncs,TRUE)) { - xfree ((void *) pScreenPriv); + free ((void *) pScreenPriv); return FALSE; } for (pVisual = pScreen->visuals; @@ -270,7 +270,7 @@ miSpriteCloseScreen (i, pScreen) miSpriteIsUpFALSE (pScreen, pScreenPriv); DamageDestroy (pScreenPriv->pDamage); - xfree ((void *) pScreenPriv); + free ((void *) pScreenPriv); return (*pScreen->CloseScreen) (i, pScreen); } diff --git a/nx-X11/programs/Xserver/mi/miwideline.c b/nx-X11/programs/Xserver/mi/miwideline.c index fa9ef4591..f3e8c691a 100644 --- a/nx-X11/programs/Xserver/mi/miwideline.c +++ b/nx-X11/programs/Xserver/mi/miwideline.c @@ -133,7 +133,7 @@ miFillPolyHelper (pDrawable, pGC, pixel, spanData, y, overall_height, spanRec.widths = (int *) xalloc (overall_height * sizeof (int)); if (!spanRec.widths) { - xfree (spanRec.points); + free (spanRec.points); return; } ppt = spanRec.points; @@ -237,7 +237,7 @@ miFillRectPolyHelper ( spanRec.widths = (int *) xalloc (h * sizeof (int)); if (!spanRec.widths) { - xfree (spanRec.points); + free (spanRec.points); return; } ppt = spanRec.points; @@ -1082,7 +1082,7 @@ miLineArc ( widths = (int *) xalloc (pGC->lineWidth * sizeof (int)); if (!widths) { - xfree (points); + free (points); return; } spanRec.points = points; diff --git a/nx-X11/programs/Xserver/mi/miwindow.c b/nx-X11/programs/Xserver/mi/miwindow.c index aff7128c3..9e87e7095 100644 --- a/nx-X11/programs/Xserver/mi/miwindow.c +++ b/nx-X11/programs/Xserver/mi/miwindow.c @@ -471,7 +471,7 @@ miHandleValidateExposures(pWin) RegionUninit(&val->after.borderExposed); (*WindowExposures)(pChild, &val->after.exposed, NullRegion); RegionUninit(&val->after.exposed); - xfree(val); + free(val); pChild->valdata = (ValidatePtr)NULL; if (pChild->firstChild) { diff --git a/nx-X11/programs/Xserver/miext/cw/cw.c b/nx-X11/programs/Xserver/miext/cw/cw.c index 9f39b9650..5b2c65927 100644 --- a/nx-X11/programs/Xserver/miext/cw/cw.c +++ b/nx-X11/programs/Xserver/miext/cw/cw.c @@ -693,7 +693,7 @@ cwCloseScreen (int i, ScreenPtr pScreen) cwFiniRender(pScreen); #endif - xfree((void *)pScreenPriv); + free((void *)pScreenPriv); return (*pScreen->CloseScreen)(i, pScreen); } diff --git a/nx-X11/programs/Xserver/miext/cw/cw_render.c b/nx-X11/programs/Xserver/miext/cw/cw_render.c index 74c52afb0..2710bf60f 100644 --- a/nx-X11/programs/Xserver/miext/cw/cw_render.c +++ b/nx-X11/programs/Xserver/miext/cw/cw_render.c @@ -84,7 +84,7 @@ cwCreatePicturePrivate (PicturePtr pPicture) &error); if (!pPicturePrivate->pBackingPicture) { - xfree (pPicturePrivate); + free (pPicturePrivate); return NULL; } @@ -108,7 +108,7 @@ cwDestroyPicturePrivate (PicturePtr pPicture) { if (pPicturePrivate->pBackingPicture) FreePicture (pPicturePrivate->pBackingPicture, 0); - xfree (pPicturePrivate); + free (pPicturePrivate); setCwPicture(pPicture, NULL); } } diff --git a/nx-X11/programs/Xserver/miext/damage/damage.c b/nx-X11/programs/Xserver/miext/damage/damage.c index f28d95820..2d6783204 100755 --- a/nx-X11/programs/Xserver/miext/damage/damage.c +++ b/nx-X11/programs/Xserver/miext/damage/damage.c @@ -1726,7 +1726,7 @@ damageCloseScreen (int i, ScreenPtr pScreen) unwrap (pScrPriv, pScreen, CopyWindow); unwrap (pScrPriv, pScreen, CloseScreen); unwrap (pScrPriv, pScreen, BackingStoreFuncs.RestoreAreas); - xfree (pScrPriv); + free (pScrPriv); return (*pScreen->CloseScreen) (i, pScreen); } @@ -1913,7 +1913,7 @@ DamageDestroy (DamagePtr pDamage) if (pDamage->damageDestroy) (*pDamage->damageDestroy) (pDamage, pDamage->closure); RegionUninit(&pDamage->damage); - xfree (pDamage); + free (pDamage); } Bool diff --git a/nx-X11/programs/Xserver/os/WaitFor.c b/nx-X11/programs/Xserver/os/WaitFor.c index 0a18c28c8..f9037ed3b 100644 --- a/nx-X11/programs/Xserver/os/WaitFor.c +++ b/nx-X11/programs/Xserver/os/WaitFor.c @@ -730,7 +730,7 @@ TimerFree(OsTimerPtr timer) if (!timer) return; TimerCancel(timer); - xfree(timer); + free(timer); } void @@ -750,7 +750,7 @@ TimerInit(void) while ((timer = timers)) { timers = timer->next; - xfree(timer); + free(timer); } } diff --git a/nx-X11/programs/Xserver/os/access.c b/nx-X11/programs/Xserver/os/access.c index 7f45e5ec9..dcd2b52af 100644 --- a/nx-X11/programs/Xserver/os/access.c +++ b/nx-X11/programs/Xserver/os/access.c @@ -261,7 +261,7 @@ typedef struct _host { (h)->addr=(unsigned char *) ((h) + 1);\ (h)->requested = FALSE; \ } -#define FreeHost(h) xfree(h) +#define FreeHost(h) free(h) static HOST *selfhosts = NULL; static HOST *validhosts = NULL; static int AccessEnabled = DEFAULT_ACCESS_CONTROL; @@ -1376,12 +1376,12 @@ Bool LocalClient(ClientPtr client) &alen, (void **)&addr); if (family == -1) { - xfree ((char *) from); + free ((char *) from); return FALSE; } if (family == FamilyLocal) { - xfree ((char *) from); + free ((char *) from); return TRUE; } for (host = selfhosts; host; host = host->next) @@ -1389,7 +1389,7 @@ Bool LocalClient(ClientPtr client) if (addrEqual (family, addr, alen, host)) return TRUE; } - xfree ((char *) from); + free ((char *) from); } return FALSE; } @@ -2327,7 +2327,7 @@ siLocalCredGetId(const char *addr, int len, siLocalCredPrivPtr lcPriv, int *id) } } - xfree(addrbuf); + free(addrbuf); return parsedOK; } @@ -2360,11 +2360,11 @@ siLocalCredAddrMatch(int family, void * addr, int len, for (i = 0 ; i < connNumSuppGids; i++) { if (connSuppGids[i] == siAddrId) { - xfree(connSuppGids); + free(connSuppGids); return TRUE; } } - xfree(connSuppGids); + free(connSuppGids); } } return FALSE; diff --git a/nx-X11/programs/Xserver/os/connection.c b/nx-X11/programs/Xserver/os/connection.c index 2df92bf91..4d5826888 100644 --- a/nx-X11/programs/Xserver/os/connection.c +++ b/nx-X11/programs/Xserver/os/connection.c @@ -279,7 +279,7 @@ void ClearConnectionTranslation(void) { struct _ct_node *temp = node; node = node->next; - xfree(temp); + free(temp); } } } @@ -713,7 +713,7 @@ ClientAuthorized(ClientPtr client, proto_n, auth_proto, auth_id); } - xfree ((char *) from); + free ((char *) from); } if (auth_id == (XID) ~0L) { @@ -731,7 +731,7 @@ ClientAuthorized(ClientPtr client, AuthAudit(client, TRUE, (struct sockaddr *) from, fromlen, proto_n, auth_proto, auth_id); - xfree ((char *) from); + free ((char *) from); } } priv->auth_id = auth_id; @@ -775,7 +775,7 @@ AllocNewConnection (XtransConnInfo trans_conn, int fd, CARD32 conn_time) oc->conn_time = conn_time; if (!(client = NextAvailableClient((void *)oc))) { - xfree (oc); + free (oc); return NullClient; } { @@ -962,7 +962,7 @@ CloseDownFileDescriptor(OsCommPtr oc) _XSERVTransClose(oc->trans_conn); } FreeOsBuffers(oc); - xfree(oc); + free(oc); #ifndef WIN32 ConnectionTranslation[connection] = 0; #else diff --git a/nx-X11/programs/Xserver/os/io.c b/nx-X11/programs/Xserver/os/io.c index fefe3007f..b8f05d939 100644 --- a/nx-X11/programs/Xserver/os/io.c +++ b/nx-X11/programs/Xserver/os/io.c @@ -222,8 +222,8 @@ ReadRequestFromClient(ClientPtr client) register ConnectionInputPtr aci = AvailableInput->input; if (aci->size > BUFWATERMARK) { - xfree(aci->buffer); - xfree(aci); + free(aci->buffer); + free(aci); } else { @@ -504,8 +504,8 @@ InsertFakeRequest(ClientPtr client, char *data, int count) ConnectionInputPtr aci = AvailableInput->input; if (aci->size > BUFWATERMARK) { - xfree(aci->buffer); - xfree(aci); + free(aci->buffer); + free(aci); } else { @@ -1154,8 +1154,8 @@ FlushClient(ClientPtr who, OsCommPtr oc, char *extraBuf, int extraCount) } if (oco->size > BUFWATERMARK) { - xfree(oco->buf); - xfree(oco); + free(oco->buf); + free(oco); } else { @@ -1177,7 +1177,7 @@ AllocateInputBuffer(void) oci->buffer = (char *)xalloc(BUFSIZE); if (!oci->buffer) { - xfree(oci); + free(oci); return (ConnectionInputPtr)NULL; } oci->size = BUFSIZE; @@ -1198,7 +1198,7 @@ AllocateOutputBuffer(void) oco->buf = (unsigned char *) xalloc(BUFSIZE); if (!oco->buf) { - xfree(oco); + free(oco); return (ConnectionOutputPtr)NULL; } oco->size = BUFSIZE; @@ -1218,8 +1218,8 @@ FreeOsBuffers(OsCommPtr oc) { if (FreeInputs) { - xfree(oci->buffer); - xfree(oci); + free(oci->buffer); + free(oci); } else { @@ -1234,8 +1234,8 @@ FreeOsBuffers(OsCommPtr oc) { if (FreeOutputs) { - xfree(oco->buf); - xfree(oco); + free(oco->buf); + free(oco); } else { @@ -1255,13 +1255,13 @@ ResetOsBuffers(void) while ((oci = FreeInputs)) { FreeInputs = oci->next; - xfree(oci->buffer); - xfree(oci); + free(oci->buffer); + free(oci); } while ((oco = FreeOutputs)) { FreeOutputs = oco->next; - xfree(oco->buf); - xfree(oco); + free(oco->buf); + free(oco); } } diff --git a/nx-X11/programs/Xserver/os/log.c b/nx-X11/programs/Xserver/os/log.c index 84381dbf2..12827cbe0 100644 --- a/nx-X11/programs/Xserver/os/log.c +++ b/nx-X11/programs/Xserver/os/log.c @@ -236,7 +236,7 @@ LogInit(const char *fname, const char *backup) * needed. */ if (saveBuffer && bufferSize > 0) { - free(saveBuffer); /* Must be free(), not xfree() */ + free(saveBuffer); /* Must be free(), not free() */ saveBuffer = NULL; bufferSize = 0; } diff --git a/nx-X11/programs/Xserver/os/mitauth.c b/nx-X11/programs/Xserver/os/mitauth.c index abf7976af..4c1ae9cf6 100644 --- a/nx-X11/programs/Xserver/os/mitauth.c +++ b/nx-X11/programs/Xserver/os/mitauth.c @@ -62,7 +62,7 @@ MitAddCookie ( return 0; new->data = (char *) xalloc ((unsigned) data_length); if (!new->data) { - xfree(new); + free(new); return 0; } new->next = mit_auth; @@ -98,8 +98,8 @@ MitResetCookie (void) for (auth = mit_auth; auth; auth=next) { next = auth->next; - xfree (auth->data); - xfree (auth); + free (auth->data); + free (auth); } mit_auth = 0; return 0; @@ -154,8 +154,8 @@ MitRemoveCookie ( prev->next = auth->next; else mit_auth = auth->next; - xfree (auth->data); - xfree (auth); + free (auth->data); + free (auth); return 1; } } diff --git a/nx-X11/programs/Xserver/os/oscolor.c b/nx-X11/programs/Xserver/os/oscolor.c index a8b01b4b9..8f737eaba 100644 --- a/nx-X11/programs/Xserver/os/oscolor.c +++ b/nx-X11/programs/Xserver/os/oscolor.c @@ -152,7 +152,7 @@ OsLookupColor(int screen, char *name, unsigned int len, #endif if (len >= sizeof(buf)) - xfree(lowername); + free(lowername); if(dbent.dptr) { diff --git a/nx-X11/programs/Xserver/os/rpcauth.c b/nx-X11/programs/Xserver/os/rpcauth.c index 91823553c..1b3db1e0e 100644 --- a/nx-X11/programs/Xserver/os/rpcauth.c +++ b/nx-X11/programs/Xserver/os/rpcauth.c @@ -121,7 +121,7 @@ authdes_ezdecode(char *inmsg, int len) return (((struct authdes_cred *) r.rq_clntcred)->adc_fullname.name); bad2: - xfree(r.rq_clntcred); + free(r.rq_clntcred); bad1: return ((char *)0); /* ((struct authdes_cred *) NULL); */ } diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index 90cf55d1a..03deb811a 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -1812,7 +1812,7 @@ Popen(char *command, char *type) return NULL; if (pipe(pdes) < 0) { - xfree(cur); + free(cur); return NULL; } @@ -1826,7 +1826,7 @@ Popen(char *command, char *type) case -1: /* error */ close(pdes[0]); close(pdes[1]); - xfree(cur); + free(cur); #ifdef NX_TRANS_EXIT if (OsVendorEndRedirectErrorFProc != NULL) { OsVendorEndRedirectErrorFProc(); @@ -1950,7 +1950,7 @@ Fopen(char *file, char *type) return NULL; if (pipe(pdes) < 0) { - xfree(cur); + free(cur); return NULL; } @@ -1958,7 +1958,7 @@ Fopen(char *file, char *type) case -1: /* error */ close(pdes[0]); close(pdes[1]); - xfree(cur); + free(cur); return NULL; case 0: /* child */ if (setgid(getgid()) == -1) @@ -2052,7 +2052,7 @@ Pclose(void * iop) pidlist = cur->next; else last->next = cur->next; - xfree(cur); + free(cur); /* allow EINTR again */ OsReleaseSignals (); diff --git a/nx-X11/programs/Xserver/os/xdmauth.c b/nx-X11/programs/Xserver/os/xdmauth.c index 92fbde478..b55f75a36 100644 --- a/nx-X11/programs/Xserver/os/xdmauth.c +++ b/nx-X11/programs/Xserver/os/xdmauth.c @@ -240,7 +240,7 @@ XdmClientAuthTimeout (long now) prev->next = next; else xdmClients = next; - xfree (client); + free (client); } else prev = client; @@ -266,14 +266,14 @@ XdmAuthorizationValidate (unsigned char *plain, int length, XdmClientAuthDecode (plain, client); if (!XdmcpCompareKeys (&client->rho, rho)) { - xfree (client); + free (client); if (reason) *reason = "Invalid XDM-AUTHORIZATION-1 key (failed key comparison)"; return NULL; } for (i = 18; i < 24; i++) if (plain[i] != 0) { - xfree (client); + free (client); if (reason) *reason = "Invalid XDM-AUTHORIZATION-1 key (failed NULL check)"; return NULL; @@ -288,15 +288,15 @@ XdmAuthorizationValidate (unsigned char *plain, int length, #if defined(TCPCONN) || defined(STREAMSCONN) if (family == FamilyInternet && memcmp((char *)addr, client->client, 4) != 0) { - xfree (client); - xfree (addr); + free (client); + free (addr); if (reason) *reason = "Invalid XDM-AUTHORIZATION-1 key (failed address comparison)"; return NULL; } #endif - xfree (addr); + free (addr); } } now = time(0); @@ -309,7 +309,7 @@ XdmAuthorizationValidate (unsigned char *plain, int length, XdmClientAuthTimeout (now); if (abs (client->time - now) > TwentyMinutes) { - xfree (client); + free (client); if (reason) *reason = "Excessive XDM-AUTHORIZATION-1 time offset"; return NULL; @@ -318,7 +318,7 @@ XdmAuthorizationValidate (unsigned char *plain, int length, { if (XdmClientAuthCompare (existing, client)) { - xfree (client); + free (client); if (reason) *reason = "XDM authorization key matches an existing client!"; return NULL; @@ -395,11 +395,11 @@ XdmCheckCookie (unsigned short cookie_length, char *cookie, { client->next = xdmClients; xdmClients = client; - xfree (plain); + free (plain); return auth->id; } } - xfree (plain); + free (plain); return (XID) -1; } @@ -412,13 +412,13 @@ XdmResetCookie (void) for (auth = xdmAuth; auth; auth=next_auth) { next_auth = auth->next; - xfree (auth); + free (auth); } xdmAuth = 0; for (client = xdmClients; client; client=next_client) { next_client = client->next; - xfree (client); + free (client); } xdmClients = (XdmClientAuthPtr) 0; return 1; @@ -438,12 +438,12 @@ XdmToID (unsigned short cookie_length, char *cookie) XdmcpUnwrap (cookie, (unsigned char *)&auth->key, plain, cookie_length); if ((client = XdmAuthorizationValidate (plain, cookie_length, &auth->rho, NULL, NULL)) != NULL) { - xfree (client); - xfree (cookie); + free (client); + free (cookie); return auth->id; } } - xfree (cookie); + free (cookie); return (XID) -1; } @@ -492,7 +492,7 @@ XdmRemoveCookie (unsigned short data_length, char *data) prev->next = auth->next; else xdmAuth = auth->next; - xfree (auth); + free (auth); return 1; } } diff --git a/nx-X11/programs/Xserver/os/xdmcp.c b/nx-X11/programs/Xserver/os/xdmcp.c index 4181e52ce..29785f48e 100644 --- a/nx-X11/programs/Xserver/os/xdmcp.c +++ b/nx-X11/programs/Xserver/os/xdmcp.c @@ -419,7 +419,7 @@ XdmcpRegisterAuthentication ( newFuncs[AuthenticationNames.length-1].Validator = Validator; newFuncs[AuthenticationNames.length-1].Generator = Generator; newFuncs[AuthenticationNames.length-1].AddAuth = AddAuth; - xfree (AuthenticationFuncsList); + free (AuthenticationFuncsList); AuthenticationFuncsList = newFuncs; AuthenticationNames.data[AuthenticationNames.length-1] = AuthenticationName; AuthenticationDatas.data[AuthenticationDatas.length-1] = AuthenticationData; @@ -512,13 +512,13 @@ XdmcpRegisterConnection ( return; if (!XdmcpReallocARRAY16 (&ConnectionTypes, ConnectionTypes.length + 1)) { - xfree (newAddress); + free (newAddress); return; } if (!XdmcpReallocARRAYofARRAY8 (&ConnectionAddresses, ConnectionAddresses.length + 1)) { - xfree (newAddress); + free (newAddress); return; } ConnectionTypes.data[ConnectionTypes.length - 1] = (CARD16) type; @@ -553,7 +553,7 @@ XdmcpRegisterAuthorization (char *name, int namelen) return; if (!XdmcpReallocARRAYofARRAY8 (&AuthorizationNames, AuthorizationNames.length +1)) { - xfree (authName.data); + free (authName.data); return; } for (i = 0; i < namelen; i++) diff --git a/nx-X11/programs/Xserver/randr/randr.c b/nx-X11/programs/Xserver/randr/randr.c index b78a947c8..afce35d7d 100644 --- a/nx-X11/programs/Xserver/randr/randr.c +++ b/nx-X11/programs/Xserver/randr/randr.c @@ -131,9 +131,9 @@ RRCloseScreen( RRMonitorClose(pScreen); - xfree(pScrPriv->crtcs); - xfree(pScrPriv->outputs); - xfree(pScrPriv); + free(pScrPriv->crtcs); + free(pScrPriv->outputs); + free(pScrPriv); RRNScreens -= 1; /* ok, one fewer screen with RandR running */ return (*pScreen->CloseScreen) (i, pScreen); } @@ -405,7 +405,7 @@ RRFreeClient(void *data, XID id) *pHead = pRREvent->next; } } - xfree((void *) pRREvent); + free((void *) pRREvent); return 1; } @@ -418,9 +418,9 @@ RRFreeEvents(void *data, XID id) for (pCur = *pHead; pCur; pCur = pNext) { pNext = pCur->next; FreeResource(pCur->clientResource, RRClientType); - xfree((void *) pCur); + free((void *) pCur); } - xfree((void *) pHead); + free((void *) pHead); return 1; } diff --git a/nx-X11/programs/Xserver/randr/rrcrtc.c b/nx-X11/programs/Xserver/randr/rrcrtc.c index d69b5ec08..6fb6e02e6 100644 --- a/nx-X11/programs/Xserver/randr/rrcrtc.c +++ b/nx-X11/programs/Xserver/randr/rrcrtc.c @@ -215,7 +215,7 @@ RRCrtcNotify(RRCrtcPtr crtc, return FALSE; } else { - xfree(crtc->outputs); + free(crtc->outputs); newoutputs = NULL; } crtc->outputs = newoutputs; @@ -391,7 +391,7 @@ RRComputeContiguity(ScreenPtr pScreen) discontiguous = FALSE; out: - xfree(reachable); + free(reachable); pScrPriv->discontiguous = discontiguous; } @@ -778,10 +778,10 @@ RRCrtcDestroyResource(void *value, XID pid) if (crtc->scanout_pixmap) RRCrtcDetachScanoutPixmap(crtc); - xfree(crtc->gammaRed); + free(crtc->gammaRed); if (crtc->mode) RRModeDestroy(crtc->mode); - xfree(crtc); + free(crtc); return 1; } @@ -899,7 +899,7 @@ RRCrtcGammaSetSize(RRCrtcPtr crtc, int size) } else gamma = NULL; - xfree(crtc->gammaRed); + free(crtc->gammaRed); crtc->gammaRed = gamma; crtc->gammaGreen = gamma + size; crtc->gammaBlue = gamma + size * 2; @@ -1089,7 +1089,7 @@ ProcRRGetCrtcInfo(ClientPtr client) WriteToClient(client, sizeof(xRRGetCrtcInfoReply), (char *) &rep); if (extraLen) { WriteToClient(client, extraLen, (char *) extra); - xfree(extra); + free(extra); } return Success; @@ -1151,7 +1151,7 @@ ProcRRSetCrtcConfig(ClientPtr client) RROutputType, client, DixSetAttrAccess); if (ret != Success) { - xfree(outputs); + free(outputs); return ret; } #else /* !defined(NXAGENT_SERVER) */ @@ -1159,7 +1159,7 @@ ProcRRSetCrtcConfig(ClientPtr client) if (!outputs[i]) { client->errorValue = outputIds[i]; if (outputs) - xfree(outputs); + free(outputs); return RRErrorBase + BadRROutput; } #endif /* !defined(NXAGENT_SERVER) */ @@ -1168,7 +1168,7 @@ ProcRRSetCrtcConfig(ClientPtr client) if (outputs[i]->crtcs[j] == crtc) break; if (j == outputs[i]->numCrtcs) { - xfree(outputs); + free(outputs); return BadMatch; } /* validate mode for this output */ @@ -1180,7 +1180,7 @@ ProcRRSetCrtcConfig(ClientPtr client) break; } if (j == outputs[i]->numModes + outputs[i]->numUserModes) { - xfree(outputs); + free(outputs); return BadMatch; } } @@ -1196,7 +1196,7 @@ ProcRRSetCrtcConfig(ClientPtr client) break; } if (k == outputs[i]->numClones) { - xfree(outputs); + free(outputs); return BadMatch; } } @@ -1230,7 +1230,7 @@ ProcRRSetCrtcConfig(ClientPtr client) * Invalid rotation */ client->errorValue = stuff->rotation; - xfree(outputs); + free(outputs); return BadValue; } @@ -1240,7 +1240,7 @@ ProcRRSetCrtcConfig(ClientPtr client) * requested rotation or reflection not supported by screen */ client->errorValue = stuff->rotation; - xfree(outputs); + free(outputs); return BadMatch; } @@ -1282,13 +1282,13 @@ ProcRRSetCrtcConfig(ClientPtr client) &source_height); if (stuff->x + source_width > width) { client->errorValue = stuff->x; - xfree(outputs); + free(outputs); return BadValue; } if (stuff->y + source_height > height) { client->errorValue = stuff->y; - xfree(outputs); + free(outputs); return BadValue; } } @@ -1304,7 +1304,7 @@ ProcRRSetCrtcConfig(ClientPtr client) pScrPriv->lastSetTime = time; sendReply: - xfree(outputs); + free(outputs); rep = (xRRSetCrtcConfigReply) { .type = X_Reply, @@ -1535,7 +1535,7 @@ ProcRRGetCrtcGamma(ClientPtr client) memcpy(extra, crtc->gammaRed, len); client->pSwapReplyFunc = (ReplySwapPtr) CopySwap16Write; WriteSwappedDataToClient(client, len, extra); - xfree(extra); + free(extra); } return Success; } @@ -1700,7 +1700,7 @@ ProcRRGetCrtcTransform(ClientPtr client) } WriteToClient(client, sizeof(xRRGetCrtcTransformReply) + nextra, (char *) reply); - xfree(reply); + free(reply); return Success; } @@ -1894,7 +1894,7 @@ RRReplaceScanoutPixmap(DrawablePtr pDrawable, PixmapPtr pPixmap, Bool enable) else crtc->scanout_pixmap = saved_scanout_pixmap[i]; } - xfree(saved_scanout_pixmap); + free(saved_scanout_pixmap); return ret; } diff --git a/nx-X11/programs/Xserver/randr/rrdispatch.c b/nx-X11/programs/Xserver/randr/rrdispatch.c index b15d1ad20..271d5d939 100644 --- a/nx-X11/programs/Xserver/randr/rrdispatch.c +++ b/nx-X11/programs/Xserver/randr/rrdispatch.c @@ -212,7 +212,7 @@ ProcRRSelectInput(ClientPtr client) pNewRREvent->next = pRREvent->next; else *pHead = pRREvent->next; - xfree(pRREvent); + free(pRREvent); } } } diff --git a/nx-X11/programs/Xserver/randr/rrinfo.c b/nx-X11/programs/Xserver/randr/rrinfo.c index df9b79986..4c47fb903 100644 --- a/nx-X11/programs/Xserver/randr/rrinfo.c +++ b/nx-X11/programs/Xserver/randr/rrinfo.c @@ -132,7 +132,7 @@ RRScanOldConfig(ScreenPtr pScreen, Rotation rotations) newMode = mode; } } - xfree(size->pRates); + free(size->pRates); } else { mode = RROldModeAdd(output, size, 0); @@ -141,7 +141,7 @@ RRScanOldConfig(ScreenPtr pScreen, Rotation rotations) } } if (pScrPriv->nSizes) - xfree(pScrPriv->pSizes); + free(pScrPriv->pSizes); pScrPriv->pSizes = NULL; pScrPriv->nSizes = 0; diff --git a/nx-X11/programs/Xserver/randr/rrmode.c b/nx-X11/programs/Xserver/randr/rrmode.c index 918e0f221..3d84a0516 100644 --- a/nx-X11/programs/Xserver/randr/rrmode.c +++ b/nx-X11/programs/Xserver/randr/rrmode.c @@ -106,13 +106,13 @@ RRModeCreate(xRRModeInfo * modeInfo, const char *name, ScreenPtr userScreen) newModes = xalloc(sizeof(RRModePtr)); if (!newModes) { - xfree(mode); + free(mode); return NULL; } mode->mode.id = FakeClientID(0); if (!AddResource(mode->mode.id, RRModeType, (void *) mode)) { - xfree(newModes); + free(newModes); return NULL; } modes = newModes; @@ -285,14 +285,14 @@ RRModeDestroy(RRModePtr mode) (num_modes - m - 1) * sizeof(RRModePtr)); num_modes--; if (!num_modes) { - xfree(modes); + free(modes); modes = NULL; } break; } } - xfree(mode); + free(mode); } static int diff --git a/nx-X11/programs/Xserver/randr/rrmonitor.c b/nx-X11/programs/Xserver/randr/rrmonitor.c index fc9b9295b..36543cb4c 100644 --- a/nx-X11/programs/Xserver/randr/rrmonitor.c +++ b/nx-X11/programs/Xserver/randr/rrmonitor.c @@ -298,7 +298,7 @@ RRMonitorInitList(ScreenPtr screen, RRMonitorListPtr mon_list, Bool get_active) static void RRMonitorFiniList(RRMonitorListPtr list) { - xfree(list->server_crtc); + free(list->server_crtc); } /* Construct a complete list of protocol-visible monitors, including @@ -401,7 +401,7 @@ RRMonitorCountList(ScreenPtr screen) void RRMonitorFree(RRMonitorPtr monitor) { - xfree(monitor); + free(monitor); } RRMonitorPtr @@ -573,8 +573,8 @@ RRMonitorFreeList(RRMonitorPtr monitors, int nmon) int m; for (m = 0; m < nmon; m++) - xfree(monitors[m].outputs); - xfree(monitors); + free(monitors[m].outputs); + free(monitors); } void @@ -600,7 +600,7 @@ RRMonitorClose(ScreenPtr screen) for (m = 0; m < pScrPriv->numMonitors; m++) RRMonitorFree(pScrPriv->monitors[m]); - xfree(pScrPriv->monitors); + free(pScrPriv->monitors); pScrPriv->monitors = NULL; pScrPriv->numMonitors = 0; } diff --git a/nx-X11/programs/Xserver/randr/rroutput.c b/nx-X11/programs/Xserver/randr/rroutput.c index 2628fabb0..46948c577 100644 --- a/nx-X11/programs/Xserver/randr/rroutput.c +++ b/nx-X11/programs/Xserver/randr/rroutput.c @@ -154,7 +154,7 @@ RROutputSetClones(RROutputPtr output, RROutputPtr * clones, int numClones) } else newClones = NULL; - xfree(output->clones); + free(output->clones); memcpy(newClones, clones, numClones * sizeof(RROutputPtr)); output->clones = newClones; output->numClones = numClones; @@ -194,7 +194,7 @@ RROutputSetModes(RROutputPtr output, if (output->modes) { for (i = 0; i < output->numModes; i++) RRModeDestroy(output->modes[i]); - xfree(output->modes); + free(output->modes); } memcpy(newModes, modes, numModes * sizeof(RRModePtr)); output->modes = newModes; @@ -299,7 +299,7 @@ RROutputSetCrtcs(RROutputPtr output, RRCrtcPtr * crtcs, int numCrtcs) } else newCrtcs = NULL; - xfree(output->crtcs); + free(output->crtcs); memcpy(newCrtcs, crtcs, numCrtcs * sizeof(RRCrtcPtr)); output->crtcs = newCrtcs; output->numCrtcs = numCrtcs; @@ -404,17 +404,17 @@ RROutputDestroyResource(void *value, XID pid) if (output->modes) { for (m = 0; m < output->numModes; m++) RRModeDestroy(output->modes[m]); - xfree(output->modes); + free(output->modes); } for (m = 0; m < output->numUserModes; m++) RRModeDestroy(output->userModes[m]); - xfree(output->userModes); + free(output->userModes); - xfree(output->crtcs); - xfree(output->clones); + free(output->crtcs); + free(output->clones); RRDeleteAllOutputProperties(output); - xfree(output); + free(output); return 1; } @@ -541,7 +541,7 @@ ProcRRGetOutputInfo(ClientPtr client) WriteToClient(client, sizeof(xRRGetOutputInfoReply), (char *) &rep); if (extraLen) { WriteToClient(client, extraLen, (char *) extra); - xfree(extra); + free(extra); } return Success; diff --git a/nx-X11/programs/Xserver/randr/rrproperty.c b/nx-X11/programs/Xserver/randr/rrproperty.c index 741d0310e..7275cd34f 100644 --- a/nx-X11/programs/Xserver/randr/rrproperty.c +++ b/nx-X11/programs/Xserver/randr/rrproperty.c @@ -63,10 +63,10 @@ RRDeliverPropertyEvent(ScreenPtr pScreen, xEvent *event) static void RRDestroyOutputProperty(RRPropertyPtr prop) { - xfree(prop->valid_values); - xfree(prop->current.data); - xfree(prop->pending.data); - xfree(prop); + free(prop->valid_values); + free(prop->current.data); + free(prop->pending.data); + free(prop); } static void @@ -225,12 +225,12 @@ RRChangeOutputProperty(RROutputPtr output, Atom property, Atom type, if (pending && pScrPriv->rrOutputSetProperty && !pScrPriv->rrOutputSetProperty(output->pScreen, output, prop->propertyName, &new_value)) { - xfree(new_value.data); + free(new_value.data); if (add) RRDestroyOutputProperty(prop); return BadValue; } - xfree(prop_value->data); + free(prop_value->data); *prop_value = new_value; } @@ -377,7 +377,7 @@ RRConfigureOutputProperty(RROutputPtr output, Atom property, * loses any pending values */ if (prop->is_pending && !pending) { - xfree(prop->pending.data); + free(prop->pending.data); RRInitOutputPropertyValue(&prop->pending); } @@ -385,7 +385,7 @@ RRConfigureOutputProperty(RROutputPtr output, Atom property, prop->range = range; prop->immutable = immutable; prop->num_valid = num_values; - xfree(prop->valid_values); + free(prop->valid_values); prop->valid_values = new_values; if (add) { @@ -442,7 +442,7 @@ ProcRRListOutputProperties(ClientPtr client) client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write; WriteSwappedDataToClient(client, numProps * sizeof(Atom), pAtoms); - xfree(pAtoms); + free(pAtoms); } return Success; } @@ -493,7 +493,7 @@ ProcRRQueryOutputProperty(ClientPtr client) client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write; WriteSwappedDataToClient(client, prop->num_valid * sizeof(INT32), extra); - xfree(extra); + free(extra); } return Success; } @@ -749,7 +749,7 @@ ProcRRGetOutputProperty(ClientPtr client) break; } WriteSwappedDataToClient(client, len, extra); - xfree(extra); + free(extra); } if (stuff->delete && (reply.bytesAfter == 0)) { /* delete the Property */ diff --git a/nx-X11/programs/Xserver/randr/rrprovider.c b/nx-X11/programs/Xserver/randr/rrprovider.c index b2251b682..4911f8fd8 100644 --- a/nx-X11/programs/Xserver/randr/rrprovider.c +++ b/nx-X11/programs/Xserver/randr/rrprovider.c @@ -152,7 +152,7 @@ ProcRRGetProviders(ClientPtr client) if (extraLen) { WriteToClient(client, extraLen, (char *) extra); - xfree(extra); + free(extra); } return Success; } @@ -295,7 +295,7 @@ ProcRRGetProviderInfo(ClientPtr client) if (extraLen) { WriteToClient(client, extraLen, (char *) extra); - xfree(extra); + free(extra); } return Success; } @@ -427,7 +427,7 @@ RRProviderDestroyResource(void *value, XID pid) (*pScrPriv->rrProviderDestroy) (pScreen, provider); pScrPriv->provider = NULL; } - xfree(provider); + free(provider); return 1; } diff --git a/nx-X11/programs/Xserver/randr/rrproviderproperty.c b/nx-X11/programs/Xserver/randr/rrproviderproperty.c index a68a94ff2..9aa2135df 100644 --- a/nx-X11/programs/Xserver/randr/rrproviderproperty.c +++ b/nx-X11/programs/Xserver/randr/rrproviderproperty.c @@ -60,10 +60,10 @@ RRDeliverPropertyEvent(ScreenPtr pScreen, xEvent *event) static void RRDestroyProviderProperty(RRPropertyPtr prop) { - xfree(prop->valid_values); - xfree(prop->current.data); - xfree(prop->pending.data); - xfree(prop); + free(prop->valid_values); + free(prop->current.data); + free(prop->pending.data); + free(prop); } static void @@ -222,10 +222,10 @@ RRChangeProviderProperty(RRProviderPtr provider, Atom property, Atom type, prop->propertyName, &new_value)) { if (add) RRDestroyProviderProperty(prop); - xfree(new_value.data); + free(new_value.data); return BadValue; } - xfree(prop_value->data); + free(prop_value->data); *prop_value = new_value; } @@ -373,7 +373,7 @@ RRConfigureProviderProperty(RRProviderPtr provider, Atom property, * loses any pending values */ if (prop->is_pending && !pending) { - xfree(prop->pending.data); + free(prop->pending.data); RRInitProviderPropertyValue(&prop->pending); } @@ -381,7 +381,7 @@ RRConfigureProviderProperty(RRProviderPtr provider, Atom property, prop->range = range; prop->immutable = immutable; prop->num_valid = num_values; - xfree(prop->valid_values); + free(prop->valid_values); prop->valid_values = new_values; if (add) { @@ -437,7 +437,7 @@ ProcRRListProviderProperties(ClientPtr client) if (numProps) { client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write; WriteSwappedDataToClient(client, numProps * sizeof(Atom), pAtoms); - xfree(pAtoms); + free(pAtoms); } return Success; } @@ -487,7 +487,7 @@ ProcRRQueryProviderProperty(ClientPtr client) client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write; WriteSwappedDataToClient(client, prop->num_valid * sizeof(INT32), extra); - xfree(extra); + free(extra); } return Success; } @@ -741,7 +741,7 @@ ProcRRGetProviderProperty(ClientPtr client) break; } WriteSwappedDataToClient(client, len, extra); - xfree(extra); + free(extra); } if (stuff->delete && (reply.bytesAfter == 0)) { /* delete the Property */ diff --git a/nx-X11/programs/Xserver/randr/rrscreen.c b/nx-X11/programs/Xserver/randr/rrscreen.c index af54d66f5..7047d80a5 100644 --- a/nx-X11/programs/Xserver/randr/rrscreen.c +++ b/nx-X11/programs/Xserver/randr/rrscreen.c @@ -334,7 +334,7 @@ ProcRRSetScreenSize(ClientPtr client) for (j = 0; j < num_modes; j++) \ total_name_len += modes[j]->mode.nameLength; \ total_modes += num_modes; \ - xfree(modes); \ + free(modes); \ } while(0) static inline void @@ -388,7 +388,7 @@ swap_modeinfos(xRRModeInfo * modeinfos, int i) names += mode->mode.nameLength; \ mode_count++; \ } \ - xfree(modes); \ + free(modes); \ } \ } while (0) @@ -504,7 +504,7 @@ rrGetMultiScreenResources(ClientPtr client, Bool query, ScreenPtr pScreen) WriteToClient(client, sizeof(xRRGetScreenResourcesReply), (char *) &rep); if (extraLen) { WriteToClient(client, extraLen, (char *) extra); - xfree(extra); + free(extra); } return Success; } @@ -597,7 +597,7 @@ rrGetScreenResources(ClientPtr client, Bool query) if (extraLen) { extra = xalloc(extraLen); if (!extra) { - xfree(modes); + free(modes); return BadAlloc; } } @@ -655,7 +655,7 @@ rrGetScreenResources(ClientPtr client, Bool query) memcpy(names, mode->name, mode->mode.nameLength); names += mode->mode.nameLength; } - xfree(modes); + free(modes); assert(bytes_to_int32((char *) names - (char *) extra) == rep.length); } @@ -673,7 +673,7 @@ rrGetScreenResources(ClientPtr client, Bool query) (char *) (char *) &rep); if (extraLen) { WriteToClient(client, extraLen, (char *) (char *) extra); - xfree(extra); + free(extra); } return Success; } @@ -876,7 +876,7 @@ ProcRRGetScreenInfo(ClientPtr client) if (extraLen) { extra = (CARD8 *) xalloc(extraLen); if (!extra) { - xfree(pData); + free(pData); return BadAlloc; } } @@ -916,7 +916,7 @@ ProcRRGetScreenInfo(ClientPtr client) } } } - xfree(pData); + free(pData); data8 = (CARD8 *) rates; @@ -939,7 +939,7 @@ ProcRRGetScreenInfo(ClientPtr client) WriteToClient(client, sizeof(xRRGetScreenInfoReply), (char *) &rep); if (extraLen) { WriteToClient(client, extraLen, (char *) extra); - xfree(extra); + free(extra); } return Success; } @@ -1035,7 +1035,7 @@ ProcRRSetScreenConfig(ClientPtr client) * Invalid size ID */ client->errorValue = stuff->sizeID; - xfree(pData); + free(pData); return BadValue; } pSize = &pData->sizes[stuff->sizeID]; @@ -1057,7 +1057,7 @@ ProcRRSetScreenConfig(ClientPtr client) * Invalid rotation */ client->errorValue = stuff->rotation; - xfree(pData); + free(pData); return BadValue; } @@ -1066,7 +1066,7 @@ ProcRRSetScreenConfig(ClientPtr client) * requested rotation or reflection not supported by screen */ client->errorValue = stuff->rotation; - xfree(pData); + free(pData); return BadMatch; } @@ -1088,7 +1088,7 @@ ProcRRSetScreenConfig(ClientPtr client) * Invalid rate */ client->errorValue = rate; - xfree(pData); + free(pData); return BadValue; } mode = pSize->pRates[i].mode; @@ -1113,12 +1113,12 @@ ProcRRSetScreenConfig(ClientPtr client) height = mode->mode.height; if (width < pScrPriv->minWidth || pScrPriv->maxWidth < width) { client->errorValue = width; - xfree(pData); + free(pData); return BadValue; } if (height < pScrPriv->minHeight || pScrPriv->maxHeight < height) { client->errorValue = height; - xfree(pData); + free(pData); return BadValue; } @@ -1159,7 +1159,7 @@ ProcRRSetScreenConfig(ClientPtr client) sendReply: - xfree(pData); + free(pData); rep = (xRRSetScreenConfigReply) { .type = X_Reply, @@ -1202,7 +1202,7 @@ RR10CurrentSizeID(ScreenPtr pScreen) sizeID = (CARD16) i; break; } - xfree(data); + free(data); } } return sizeID; diff --git a/nx-X11/programs/Xserver/randr/rrtransform.c b/nx-X11/programs/Xserver/randr/rrtransform.c index 4377d09aa..743e227ea 100644 --- a/nx-X11/programs/Xserver/randr/rrtransform.c +++ b/nx-X11/programs/Xserver/randr/rrtransform.c @@ -37,7 +37,7 @@ RRTransformInit(RRTransformPtr transform) void RRTransformFini(RRTransformPtr transform) { - xfree(transform->params); + free(transform->params); } Bool @@ -81,7 +81,7 @@ RRTransformSetFilter(RRTransformPtr dst, } else new_params = NULL; - xfree(dst->params); + free(dst->params); dst->filter = filter; dst->params = new_params; dst->nparams = nparams; diff --git a/nx-X11/programs/Xserver/record/record.c b/nx-X11/programs/Xserver/record/record.c index 590a343a0..7fabf79c6 100644 --- a/nx-X11/programs/Xserver/record/record.c +++ b/nx-X11/programs/Xserver/record/record.c @@ -1126,7 +1126,7 @@ RecordUninstallHooks(pRCAP, oneclient) { /* nobody needs it, so free it */ pClient->requestVector = pClientPriv->originalVector; pClient->devPrivates[RecordClientPrivateIndex].ptr = NULL; - xfree(pClientPriv); + free(pClientPriv); } } /* end if this RCAP specifies any requests */ } /* end if not future clients */ @@ -1197,8 +1197,8 @@ RecordDeleteClientFromRCAP(pRCAP, position) } /* free the RCAP */ if (pRCAP->clientIDsSeparatelyAllocated) - xfree(pRCAP->pClientIDs); - xfree(pRCAP); + free(pRCAP->pClientIDs); + free(pRCAP); } } /* RecordDeleteClientFromRCAP */ @@ -1979,11 +1979,11 @@ bailout: { for (i = 0; i < maxSets; i++) if (si[i].intervals) - xfree(si[i].intervals); + free(si[i].intervals); DEALLOCATE_LOCAL(si); } if (pCanonClients && pCanonClients != (XID *)&stuff[1]) - xfree(pCanonClients); + free(pCanonClients); return err; } /* RecordRegisterClients */ @@ -2068,7 +2068,7 @@ ProcRecordCreateContext(client) } bailout: if (pContext) - xfree(pContext); + free(pContext); return err; } /* ProcRecordCreateContext */ @@ -2119,7 +2119,7 @@ ProcRecordUnregisterClients(client) RecordDeleteClientFromContext(pContext, pCanonClients[i]); } if (pCanonClients != (XID *)&stuff[1]) - xfree(pCanonClients); + free(pCanonClients); return Success; } /* ProcRecordUnregisterClients */ @@ -2471,7 +2471,7 @@ ProcRecordGetContext(client) bailout: for (i = 0; i < nRCAPs; i++) { - if (pRangeInfo[i].pRanges) xfree(pRangeInfo[i].pRanges); + if (pRangeInfo[i].pRanges) free(pRangeInfo[i].pRanges); } DEALLOCATE_LOCAL(pRangeInfo); return err; @@ -2646,7 +2646,7 @@ RecordDeleteContext(value, id) } } - xfree(pContext); + free(pContext); /* remove context from AllContexts list */ @@ -2655,7 +2655,7 @@ RecordDeleteContext(value, id) ppAllContexts[i] = ppAllContexts[numContexts - 1]; if (--numContexts == 0) { - xfree(ppAllContexts); + free(ppAllContexts); ppAllContexts = NULL; } } diff --git a/nx-X11/programs/Xserver/record/set.c b/nx-X11/programs/Xserver/record/set.c index 83fb0e7d7..28547f3d0 100644 --- a/nx-X11/programs/Xserver/record/set.c +++ b/nx-X11/programs/Xserver/record/set.c @@ -73,7 +73,6 @@ typedef int Bool; typedef unsigned short CARD16; #define xalloc malloc -#define xfree free #define ALLOCATE_LOCAL malloc #define DEALLOCATE_LOCAL free @@ -135,7 +134,7 @@ static void BitVectorDestroySet(pSet) RecordSetPtr pSet; { - xfree(pSet); + free(pSet); } static unsigned long @@ -295,7 +294,7 @@ static void IntervalListDestroySet(pSet) RecordSetPtr pSet; { - xfree(pSet); + free(pSet); } static unsigned long @@ -702,7 +701,7 @@ int main(argc, argv) if (testcount & 1) { - xfree(bs); + free(bs); } } } diff --git a/nx-X11/programs/Xserver/render/animcur.c b/nx-X11/programs/Xserver/render/animcur.c index 27e5ab949..993800c7e 100644 --- a/nx-X11/programs/Xserver/render/animcur.c +++ b/nx-X11/programs/Xserver/render/animcur.c @@ -128,7 +128,7 @@ AnimCurCloseScreen (int index, ScreenPtr pScreen) Unwrap(as, pScreen, RecolorCursor); SetAnimCurScreen(pScreen,0); ret = (*pScreen->CloseScreen) (index, pScreen); - xfree (as); + free (as); if (index == 0) AnimCurScreenPrivateIndex = -1; return ret; diff --git a/nx-X11/programs/Xserver/render/filter.c b/nx-X11/programs/Xserver/render/filter.c index 57a21a8c0..31d5481c9 100644 --- a/nx-X11/programs/Xserver/render/filter.c +++ b/nx-X11/programs/Xserver/render/filter.c @@ -73,7 +73,7 @@ PictureGetFilterId (char *filter, int len, Bool makeit) names = xalloc (sizeof (char *)); if (!names) { - xfree (name); + free (name); return -1; } filterNames = names; @@ -119,8 +119,8 @@ PictureFreeFilterIds (void) int i; for (i = 0; i < nfilterNames; i++) - xfree (filterNames[i]); - xfree (filterNames); + free (filterNames[i]); + free (filterNames); nfilterNames = 0; filterNames = 0; } @@ -272,8 +272,8 @@ PictureResetFilters (ScreenPtr pScreen) { PictureScreenPtr ps = GetPictureScreen(pScreen); - xfree (ps->filters); - xfree (ps->filterAliases); + free (ps->filters); + free (ps->filterAliases); PictureFreeFilterIds (); } @@ -340,7 +340,7 @@ SetPicturePictFilter (PicturePtr pPicture, PictFilterPtr pFilter, if (!new_params && nparams) return BadAlloc; - xfree (pPicture->filter_params); + free (pPicture->filter_params); pPicture->filter_params = new_params; pPicture->filter_nparams = nparams; } diff --git a/nx-X11/programs/Xserver/render/glyph.c b/nx-X11/programs/Xserver/render/glyph.c index 854a9069d..f956c44b2 100644 --- a/nx-X11/programs/Xserver/render/glyph.c +++ b/nx-X11/programs/Xserver/render/glyph.c @@ -264,7 +264,7 @@ FreeGlyph (GlyphPtr glyph, int format) gr->signature = 0; globalGlyphs[format].tableEntries--; } - xfree (glyph); + free (glyph); } } @@ -281,7 +281,7 @@ AddGlyph (GlyphSetPtr glyphSet, GlyphPtr glyph, Glyph id) gr = FindGlyphRef (&globalGlyphs[glyphSet->fdepth], hash, TRUE, glyph); if (gr->glyph && gr->glyph != DeletedGlyph) { - xfree (glyph); + free (glyph); glyph = gr->glyph; } else @@ -404,7 +404,7 @@ ResizeGlyphHash (GlyphHashPtr hash, CARD32 change, Bool global) ++newHash.tableEntries; } } - xfree (hash->table); + free (hash->table); } *hash = newHash; if (global) @@ -444,7 +444,7 @@ AllocateGlyphSet (int fdepth, PictFormatPtr format) if (!AllocateGlyphHash (&glyphSet->hash, &glyphHashSets[0])) { - xfree (glyphSet); + free (glyphSet); return FALSE; } glyphSet->refcnt = 1; @@ -473,19 +473,19 @@ FreeGlyphSet (void *value, } if (!globalGlyphs[glyphSet->fdepth].tableEntries) { - xfree (globalGlyphs[glyphSet->fdepth].table); + free (globalGlyphs[glyphSet->fdepth].table); globalGlyphs[glyphSet->fdepth].table = 0; globalGlyphs[glyphSet->fdepth].hashSet = 0; } else ResizeGlyphHash (&globalGlyphs[glyphSet->fdepth], 0, TRUE); - xfree (table); + free (table); if (glyphSet->devPrivates && glyphSet->devPrivates != (void *)(&glyphSet[1])) - xfree(glyphSet->devPrivates); + free(glyphSet->devPrivates); - xfree (glyphSet); + free (glyphSet); } return Success; } diff --git a/nx-X11/programs/Xserver/render/miindex.c b/nx-X11/programs/Xserver/render/miindex.c index 03e2857a2..ad2653c14 100644 --- a/nx-X11/programs/Xserver/render/miindex.c +++ b/nx-X11/programs/Xserver/render/miindex.c @@ -267,7 +267,7 @@ miInitIndexed (ScreenPtr pScreen, pFormat->index.pValues = xalloc (num * sizeof (xIndexValue)); if (!pFormat->index.pValues) { - xfree (pIndexed); + free (pIndexed); return FALSE; } @@ -323,12 +323,12 @@ miCloseIndexed (ScreenPtr pScreen, { if (pFormat->index.devPrivate) { - xfree (pFormat->index.devPrivate); + free (pFormat->index.devPrivate); pFormat->index.devPrivate = 0; } if (pFormat->index.pValues) { - xfree (pFormat->index.pValues); + free (pFormat->index.pValues); pFormat->index.pValues = 0; } } diff --git a/nx-X11/programs/Xserver/render/mipict.c b/nx-X11/programs/Xserver/render/mipict.c index ae7cf5a6d..5bd449d44 100644 --- a/nx-X11/programs/Xserver/render/mipict.c +++ b/nx-X11/programs/Xserver/render/mipict.c @@ -107,7 +107,7 @@ miChangePictureClip (PicturePtr pPicture, if (!clientClip) return BadAlloc; clientClipType = CT_REGION; - xfree(value); + free(value); break; } (*ps->DestroyPictureClip) (pPicture); diff --git a/nx-X11/programs/Xserver/render/picture.c b/nx-X11/programs/Xserver/render/picture.c index a29a9568c..1e653b0c3 100644 --- a/nx-X11/programs/Xserver/render/picture.c +++ b/nx-X11/programs/Xserver/render/picture.c @@ -141,9 +141,9 @@ PictureCloseScreen (int index, ScreenPtr pScreen) (*ps->CloseIndexed) (pScreen, &ps->formats[n]); SetPictureScreen(pScreen, 0); if (ps->PicturePrivateSizes) - xfree (ps->PicturePrivateSizes); - xfree (ps->formats); - xfree (ps); + free (ps->PicturePrivateSizes); + free (ps->formats); + free (ps); return ret; } @@ -660,7 +660,7 @@ PictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats) { if (!AddResource (formats[n].id, PictFormatType, (void *) (formats+n))) { - xfree (formats); + free (formats); return FALSE; } if (formats[n].type == PictTypeIndexed) @@ -692,15 +692,15 @@ PictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats) ps = (PictureScreenPtr) xalloc (sizeof (PictureScreenRec)); if (!ps) { - xfree (formats); + free (formats); return FALSE; } SetPictureScreen(pScreen, ps); if (!GlyphInit (pScreen)) { SetPictureScreen(pScreen, 0); - xfree (formats); - xfree (ps); + free (formats); + free (ps); return FALSE; } @@ -730,8 +730,8 @@ PictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats) { PictureResetFilters (pScreen); SetPictureScreen(pScreen, 0); - xfree (formats); - xfree (ps); + free (formats); + free (ps); return FALSE; } @@ -1003,7 +1003,7 @@ CreateSolidPicture (Picture pid, xRenderColor *color, int *error) pPicture->pSourcePict = (SourcePictPtr) xalloc(sizeof(PictSolidFill)); if (!pPicture->pSourcePict) { *error = BadAlloc; - xfree(pPicture); + free(pPicture); return 0; } pPicture->pSourcePict->type = SourcePictTypeSolidFill; @@ -1037,7 +1037,7 @@ CreateLinearGradientPicture (Picture pid, xPointFixed *p1, xPointFixed *p2, pPicture->pSourcePict = (SourcePictPtr) xalloc(sizeof(PictLinearGradient)); if (!pPicture->pSourcePict) { *error = BadAlloc; - xfree(pPicture); + free(pPicture); return 0; } @@ -1047,7 +1047,7 @@ CreateLinearGradientPicture (Picture pid, xPointFixed *p1, xPointFixed *p2, initGradient(pPicture->pSourcePict, nStops, stops, colors, error); if (*error) { - xfree(pPicture); + free(pPicture); return 0; } return pPicture; @@ -1086,7 +1086,7 @@ CreateRadialGradientPicture (Picture pid, xPointFixed *inner, xPointFixed *outer pPicture->pSourcePict = (SourcePictPtr) xalloc(sizeof(PictRadialGradient)); if (!pPicture->pSourcePict) { *error = BadAlloc; - xfree(pPicture); + free(pPicture); return 0; } radial = &pPicture->pSourcePict->radial; @@ -1110,7 +1110,7 @@ CreateRadialGradientPicture (Picture pid, xPointFixed *inner, xPointFixed *outer initGradient(pPicture->pSourcePict, nStops, stops, colors, error); if (*error) { - xfree(pPicture); + free(pPicture); return 0; } return pPicture; @@ -1137,7 +1137,7 @@ CreateConicalGradientPicture (Picture pid, xPointFixed *center, xFixed angle, pPicture->pSourcePict = (SourcePictPtr) xalloc(sizeof(PictConicalGradient)); if (!pPicture->pSourcePict) { *error = BadAlloc; - xfree(pPicture); + free(pPicture); return 0; } @@ -1147,7 +1147,7 @@ CreateConicalGradientPicture (Picture pid, xPointFixed *center, xFixed angle, initGradient(pPicture->pSourcePict, nStops, stops, colors, error); if (*error) { - xfree(pPicture); + free(pPicture); return 0; } return pPicture; @@ -1487,7 +1487,7 @@ SetPictureTransform (PicturePtr pPicture, { if (pPicture->transform) { - xfree (pPicture->transform); + free (pPicture->transform); pPicture->transform = 0; } } @@ -1611,12 +1611,12 @@ FreePicture (void * value, if (--pPicture->refcnt == 0) { if (pPicture->transform) - xfree (pPicture->transform); + free (pPicture->transform); if (!pPicture->pDrawable) { if (pPicture->pSourcePict) { if (pPicture->pSourcePict->type != SourcePictTypeSolidFill) - xfree(pPicture->pSourcePict->linear.stops); - xfree(pPicture->pSourcePict); + free(pPicture->pSourcePict->linear.stops); + free(pPicture->pSourcePict); } } else { ScreenPtr pScreen = pPicture->pDrawable->pScreen; @@ -1647,7 +1647,7 @@ FreePicture (void * value, (*pScreen->DestroyPixmap) ((PixmapPtr)pPicture->pDrawable); } } - xfree (pPicture); + free (pPicture); } return Success; } diff --git a/nx-X11/programs/Xserver/render/render.c b/nx-X11/programs/Xserver/render/render.c index 5a4114adc..58b3dbc88 100644 --- a/nx-X11/programs/Xserver/render/render.c +++ b/nx-X11/programs/Xserver/render/render.c @@ -552,7 +552,7 @@ ProcRenderQueryPictFormats (ClientPtr client) swapl (&reply->numSubpixel, n); } WriteToClient(client, rlength, (char *) reply); - xfree (reply); + free (reply); return client->noClientException; } #endif /* NXAGENT_SERVER */ @@ -617,7 +617,7 @@ ProcRenderQueryPictIndexValues (ClientPtr client) } WriteToClient(client, rlength, (char *) reply); - xfree(reply); + free(reply); return (client->noClientException); } @@ -1196,16 +1196,16 @@ ProcRenderAddGlyphs (ClientPtr client) } if (glyphsBase != glyphsLocal) - Xfree (glyphsBase); + free (glyphsBase); return client->noClientException; bail: while (glyphs != glyphsBase) { --glyphs; - xfree (glyphs->glyph); + free (glyphs->glyph); } if (glyphsBase != glyphsLocal) - Xfree (glyphsBase); + free (glyphsBase); return err; } @@ -1542,14 +1542,14 @@ ProcRenderCreateCursor (ClientPtr client) srcbits = (unsigned char *)xalloc(nbytes_mono); if (!srcbits) { - xfree (argbbits); + free (argbbits); return (BadAlloc); } mskbits = (unsigned char *)xalloc(nbytes_mono); if (!mskbits) { - xfree(argbbits); - xfree(srcbits); + free(argbbits); + free(srcbits); return (BadAlloc); } bzero ((char *) mskbits, nbytes_mono); @@ -1571,26 +1571,26 @@ ProcRenderCreateCursor (ClientPtr client) pFormat = PictureMatchFormat (pScreen, 32, PICT_a8r8g8b8); if (!pFormat) { - xfree (argbbits); - xfree (srcbits); - xfree (mskbits); + free (argbbits); + free (srcbits); + free (mskbits); return (BadImplementation); } pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height, 32); if (!pPixmap) { - xfree (argbbits); - xfree (srcbits); - xfree (mskbits); + free (argbbits); + free (srcbits); + free (mskbits); return (BadAlloc); } pPicture = CreatePicture (0, &pPixmap->drawable, pFormat, 0, 0, client, &error); if (!pPicture) { - xfree (argbbits); - xfree (srcbits); - xfree (mskbits); + free (argbbits); + free (srcbits); + free (mskbits); return error; } (*pScreen->DestroyPixmap) (pPixmap); @@ -1674,7 +1674,7 @@ ProcRenderCreateCursor (ClientPtr client) } else { - xfree (argbbits); + free (argbbits); argbbits = 0; } @@ -1819,7 +1819,7 @@ ProcRenderQueryFilters (ClientPtr client) swapl(&reply->numFilters, n); } WriteToClient(client, total_bytes, (char *) reply); - xfree (reply); + free (reply); return(client->noClientException); } @@ -1873,7 +1873,7 @@ ProcRenderCreateAnimCursor (ClientPtr client) RT_CURSOR, SecurityReadAccess); if (!cursors[i]) { - xfree (cursors); + free (cursors); client->errorValue = elt->cursor; return BadCursor; } @@ -1881,7 +1881,7 @@ ProcRenderCreateAnimCursor (ClientPtr client) elt++; } ret = AnimCursorCreate (cursors, deltas, ncursor, &pCursor); - xfree (cursors); + free (cursors); if (ret != Success) return ret; @@ -2707,7 +2707,7 @@ PanoramiXRenderCreatePicture (ClientPtr client) if (result == Success) AddResource(newPict->info[0].id, XRT_PICTURE, newPict); else - xfree(newPict); + free(newPict); return (result); } diff --git a/nx-X11/programs/Xserver/xfixes/cursor.c b/nx-X11/programs/Xserver/xfixes/cursor.c index acdd9cf2e..6618dd45a 100755 --- a/nx-X11/programs/Xserver/xfixes/cursor.c +++ b/nx-X11/programs/Xserver/xfixes/cursor.c @@ -124,7 +124,7 @@ CursorCloseScreen (int index, ScreenPtr pScreen) Unwrap (cs, pScreen, CloseScreen); Unwrap (cs, pScreen, DisplayCursor); ret = (*pScreen->CloseScreen) (index, pScreen); - xfree (cs); + free (cs); if (index == 0) CursorScreenPrivateIndex = -1; return ret; @@ -174,7 +174,7 @@ XFixesSelectCursorInput (ClientPtr pClient, if (!AddResource (pWindow->drawable.id, CursorWindowType, (void *) pWindow)) { - xfree (e); + free (e); return BadAlloc; } @@ -346,7 +346,7 @@ ProcXFixesGetCursorImage (ClientPtr client) } (void) WriteToClient(client, sizeof (xXFixesGetCursorImageReply) + (npixels << 2), (char *) rep); - xfree (rep); + free (rep); return client->noClientException; } @@ -502,7 +502,7 @@ ProcXFixesGetCursorImageAndName (ClientPtr client) } (void) WriteToClient(client, sizeof (xXFixesGetCursorImageAndNameReply) + (npixels << 2) + nbytesRound, (char *) rep); - xfree (rep); + free (rep); return client->noClientException; } @@ -699,7 +699,7 @@ CursorFreeClient (void * data, XID id) if (e == old) { *prev = e->next; - xfree (e); + free (e); break; } } diff --git a/nx-X11/programs/Xserver/xfixes/region.c b/nx-X11/programs/Xserver/xfixes/region.c index 0b1865cf0..ba840f4b3 100755 --- a/nx-X11/programs/Xserver/xfixes/region.c +++ b/nx-X11/programs/Xserver/xfixes/region.c @@ -608,7 +608,7 @@ ProcXFixesFetchRegion (ClientPtr client) } (void) WriteToClient(client, sizeof (xXFixesFetchRegionReply) + nBox * sizeof (xRectangle), (char *) reply); - xfree (reply); + free (reply); return (client->noClientException); } diff --git a/nx-X11/programs/Xserver/xfixes/select.c b/nx-X11/programs/Xserver/xfixes/select.c index 464979165..4abad3f19 100755 --- a/nx-X11/programs/Xserver/xfixes/select.c +++ b/nx-X11/programs/Xserver/xfixes/select.c @@ -174,7 +174,7 @@ XFixesSelectSelectionInput (ClientPtr pClient, if (!AddResource (pWindow->drawable.id, SelectionWindowType, (void *) pWindow)) { - xfree (e); + free (e); return BadAlloc; } @@ -250,7 +250,7 @@ SelectionFreeClient (void * data, XID id) if (e == old) { *prev = e->next; - xfree (e); + free (e); CheckSelectionCallback (); break; } diff --git a/nx-X11/programs/Xserver/xkb/ddxList.c b/nx-X11/programs/Xserver/xkb/ddxList.c index 3dfb85644..2b8f90bad 100644 --- a/nx-X11/programs/Xserver/xkb/ddxList.c +++ b/nx-X11/programs/Xserver/xkb/ddxList.c @@ -169,7 +169,7 @@ char tmpname[PATH_MAX]; if ((list->pattern[what][0]=='*')&&(list->pattern[what][1]=='\0')) { buf = Xprintf("%s/%s.dir",XkbBaseDirectory,componentDirs[what]); in= fopen(buf,"r"); - xfree (buf); + free (buf); buf = NULL; } if (!in) { @@ -186,7 +186,7 @@ char tmpname[PATH_MAX]; if ((list->pattern[what][0]=='*')&&(list->pattern[what][1]=='\0')) { buf = Xprintf("%s.dir",componentDirs[what]); in= fopen(buf,"r"); - xfree (buf); + free (buf); buf = NULL; } if (!in) { @@ -217,7 +217,7 @@ char tmpname[PATH_MAX]; if (!in) { if (buf != NULL) - xfree (buf); + free (buf); #ifdef WIN32 unlink(tmpname); #endif @@ -277,7 +277,7 @@ char tmpname[PATH_MAX]; unlink(tmpname); #endif if (buf != NULL) - xfree (buf); + free (buf); return status; } diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c b/nx-X11/programs/Xserver/xkb/ddxLoad.c index b3ef60f22..9134e4754 100644 --- a/nx-X11/programs/Xserver/xkb/ddxLoad.c +++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c @@ -151,7 +151,7 @@ Win32System(const char *cmdline) LocalFree(buffer); } - xfree(cmd); + free(cmd); return -1; } /* Wait until child process exits. */ @@ -162,7 +162,7 @@ Win32System(const char *cmdline) /* Close process and thread handles. */ CloseHandle( pi.hProcess ); CloseHandle( pi.hThread ); - xfree(cmd); + free(cmd); return dwExitCode; } @@ -620,7 +620,7 @@ char *cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile; if (outFile!=NULL) _XkbFree(outFile); if (cmd!=NULL) - xfree(cmd); + free(cmd); return True; } #ifdef DEBUG @@ -629,7 +629,7 @@ char *cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile; if (outFile!=NULL) _XkbFree(outFile); if (cmd!=NULL) - xfree(cmd); + free(cmd); return False; } @@ -802,7 +802,7 @@ char tmpname[PATH_MAX]; } #endif if (buf != NULL) - xfree (buf); + free (buf); return True; } #ifdef DEBUG @@ -826,7 +826,7 @@ char tmpname[PATH_MAX]; if (nameRtrn) nameRtrn[0]= '\0'; if (buf != NULL) - xfree (buf); + free (buf); return False; } diff --git a/nx-X11/programs/Xserver/xkb/xkb.c b/nx-X11/programs/Xserver/xkb/xkb.c index 20aab8ef0..7085fbfe4 100644 --- a/nx-X11/programs/Xserver/xkb/xkb.c +++ b/nx-X11/programs/Xserver/xkb/xkb.c @@ -4823,16 +4823,16 @@ char * wire; return status; status = _GetCountedString(&wire, client, &val); if (status != Success) { - xfree(name); + free(name); return status; } if (XkbAddGeomProperty(geom,name,val)==NULL) { - xfree(name); - xfree(val); + free(name); + free(val); return BadAlloc; } - xfree(name); - xfree(val); + free(name); + free(val); } if (req->nColors<2) { @@ -4860,10 +4860,10 @@ char * wire; if (status != Success) return status; if (!XkbAddGeomColor(geom,name,geom->num_colors)) { - xfree(name); + free(name); return BadAlloc; } - xfree(name); + free(name); } if (req->nColors!=geom->num_colors) { client->errorValue= _XkbErrCode3(0x05,req->nColors,geom->num_colors); |