aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/xfixes
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/programs/Xserver/xfixes')
-rwxr-xr-xnx-X11/programs/Xserver/xfixes/cursor.c18
-rwxr-xr-xnx-X11/programs/Xserver/xfixes/region.c6
-rwxr-xr-xnx-X11/programs/Xserver/xfixes/select.c6
3 files changed, 15 insertions, 15 deletions
diff --git a/nx-X11/programs/Xserver/xfixes/cursor.c b/nx-X11/programs/Xserver/xfixes/cursor.c
index acdd9cf2e..c60d4b37c 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;
@@ -157,7 +157,7 @@ XFixesSelectCursorInput (ClientPtr pClient,
}
if (!e)
{
- e = (CursorEventPtr) xalloc (sizeof (CursorEventRec));
+ e = (CursorEventPtr) malloc (sizeof (CursorEventRec));
if (!e)
return BadAlloc;
@@ -174,7 +174,7 @@ XFixesSelectCursorInput (ClientPtr pClient,
if (!AddResource (pWindow->drawable.id, CursorWindowType,
(void *) pWindow))
{
- xfree (e);
+ free (e);
return BadAlloc;
}
@@ -312,7 +312,7 @@ ProcXFixesGetCursorImage (ClientPtr client)
width = pCursor->bits->width;
height = pCursor->bits->height;
npixels = width * height;
- rep = xalloc (sizeof (xXFixesGetCursorImageReply) +
+ rep = malloc (sizeof (xXFixesGetCursorImageReply) +
npixels * sizeof (CARD32));
if (!rep)
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;
}
@@ -463,7 +463,7 @@ ProcXFixesGetCursorImageAndName (ClientPtr client)
name = pCursor->name ? NameForAtom (pCursor->name) : "";
nbytes = strlen (name);
nbytesRound = (nbytes + 3) & ~3;
- rep = xalloc (sizeof (xXFixesGetCursorImageAndNameReply) +
+ rep = malloc (sizeof (xXFixesGetCursorImageAndNameReply) +
npixels * sizeof (CARD32) + nbytesRound);
if (!rep)
return BadAlloc;
@@ -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;
}
}
@@ -740,7 +740,7 @@ XFixesCursorInit (void)
ScreenPtr pScreen = screenInfo.screens[i];
CursorScreenPtr cs;
- cs = (CursorScreenPtr) xalloc (sizeof (CursorScreenRec));
+ cs = (CursorScreenPtr) malloc (sizeof (CursorScreenRec));
if (!cs)
return FALSE;
Wrap (cs, pScreen, CloseScreen, CursorCloseScreen);
diff --git a/nx-X11/programs/Xserver/xfixes/region.c b/nx-X11/programs/Xserver/xfixes/region.c
index 0b1865cf0..09f33d0ac 100755
--- a/nx-X11/programs/Xserver/xfixes/region.c
+++ b/nx-X11/programs/Xserver/xfixes/region.c
@@ -575,7 +575,7 @@ ProcXFixesFetchRegion (ClientPtr client)
pBox = RegionRects (pRegion);
nBox = RegionNumRects (pRegion);
- reply = xalloc (sizeof (xXFixesFetchRegionReply) +
+ reply = malloc (sizeof (xXFixesFetchRegionReply) +
nBox * sizeof (xRectangle));
if (!reply)
return BadAlloc;
@@ -608,7 +608,7 @@ ProcXFixesFetchRegion (ClientPtr client)
}
(void) WriteToClient(client, sizeof (xXFixesFetchRegionReply) +
nBox * sizeof (xRectangle), (char *) reply);
- xfree (reply);
+ free (reply);
return (client->noClientException);
}
@@ -822,7 +822,7 @@ ProcXFixesExpandRegion (ClientPtr client)
pSrc = RegionRects(pSource);
if (nBoxes)
{
- pTmp = xalloc (nBoxes * sizeof (BoxRec));
+ pTmp = malloc (nBoxes * sizeof (BoxRec));
if (!pTmp)
return BadAlloc;
for (i = 0; i < nBoxes; i++)
diff --git a/nx-X11/programs/Xserver/xfixes/select.c b/nx-X11/programs/Xserver/xfixes/select.c
index 464979165..6fe632c0d 100755
--- a/nx-X11/programs/Xserver/xfixes/select.c
+++ b/nx-X11/programs/Xserver/xfixes/select.c
@@ -156,7 +156,7 @@ XFixesSelectSelectionInput (ClientPtr pClient,
}
if (!e)
{
- e = (SelectionEventPtr) xalloc (sizeof (SelectionEventRec));
+ e = (SelectionEventPtr) malloc (sizeof (SelectionEventRec));
if (!e)
return BadAlloc;
@@ -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;
}