aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/mi
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/programs/Xserver/mi')
-rw-r--r--nx-X11/programs/Xserver/mi/miarc.c26
-rw-r--r--nx-X11/programs/Xserver/mi/mibank.c10
-rw-r--r--nx-X11/programs/Xserver/mi/mibitblt.c4
-rw-r--r--nx-X11/programs/Xserver/mi/mibstore.c8
-rw-r--r--nx-X11/programs/Xserver/mi/micmap.c12
-rw-r--r--nx-X11/programs/Xserver/mi/midash.c2
-rw-r--r--nx-X11/programs/Xserver/mi/midispcur.c18
-rw-r--r--nx-X11/programs/Xserver/mi/migc.c4
-rw-r--r--nx-X11/programs/Xserver/mi/mioverlay.c10
-rw-r--r--nx-X11/programs/Xserver/mi/mipointer.c2
-rw-r--r--nx-X11/programs/Xserver/mi/mipolyutil.c2
-rw-r--r--nx-X11/programs/Xserver/mi/mipushpxl.c2
-rw-r--r--nx-X11/programs/Xserver/mi/miscrinit.c2
-rw-r--r--nx-X11/programs/Xserver/mi/mispans.c58
-rw-r--r--nx-X11/programs/Xserver/mi/misprite.c4
-rw-r--r--nx-X11/programs/Xserver/mi/miwideline.c6
-rw-r--r--nx-X11/programs/Xserver/mi/miwindow.c2
17 files changed, 86 insertions, 86 deletions
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)
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 20:47:19 +0000