aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/Xi
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/programs/Xserver/Xi')
-rw-r--r--nx-X11/programs/Xserver/Xi/chgptr.c4
-rw-r--r--nx-X11/programs/Xserver/Xi/exevents.c12
-rw-r--r--nx-X11/programs/Xserver/Xi/getdctl.c2
-rw-r--r--nx-X11/programs/Xserver/Xi/getfctl.c2
-rw-r--r--nx-X11/programs/Xserver/Xi/getprop.c2
-rw-r--r--nx-X11/programs/Xserver/Xi/getselev.c2
-rw-r--r--nx-X11/programs/Xserver/Xi/listdev.c2
-rw-r--r--nx-X11/programs/Xserver/Xi/queryst.c2
8 files changed, 14 insertions, 14 deletions
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;
}