aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/Xext
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/programs/Xserver/Xext')
-rw-r--r--nx-X11/programs/Xserver/Xext/extmod/modinit.c2
-rw-r--r--nx-X11/programs/Xserver/Xext/panoramiX.c16
-rw-r--r--nx-X11/programs/Xserver/Xext/panoramiXprocs.c16
-rw-r--r--nx-X11/programs/Xserver/Xext/saver.c14
-rw-r--r--nx-X11/programs/Xserver/Xext/security.c20
-rw-r--r--nx-X11/programs/Xserver/Xext/shape.c8
-rw-r--r--nx-X11/programs/Xserver/Xext/shm.c8
-rw-r--r--nx-X11/programs/Xserver/Xext/sleepuntil.c4
-rw-r--r--nx-X11/programs/Xserver/Xext/sync.c28
-rw-r--r--nx-X11/programs/Xserver/Xext/xcmisc.c2
-rw-r--r--nx-X11/programs/Xserver/Xext/xf86bigfont.c6
-rw-r--r--nx-X11/programs/Xserver/Xext/xvdisp.c2
-rw-r--r--nx-X11/programs/Xserver/Xext/xvmain.c6
-rw-r--r--nx-X11/programs/Xserver/Xext/xvmc.c20
14 files changed, 76 insertions, 76 deletions
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);
}