summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2010-12-02 12:56:53 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2010-12-06 10:03:31 +1000
commit81ada2b639979aa731854b5441cecb72910643e4 (patch)
tree0f58b84b0ba375476ef775587f3f4a95643d727f
parent4f79c6a79aecda664e1397eaba0d32f44eec7508 (diff)
Drop libc wrappers for free, malloc
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Cyril Brulebois <kibi@debian.org>
-rw-r--r--src/xf86Fpit.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c
index ceeecbd..cb98884 100644
--- a/src/xf86Fpit.c
+++ b/src/xf86Fpit.c
@@ -481,7 +481,7 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode)
*/
xf86MotionHistoryAllocate(pInfo);
/*
- * This once has caused the server to crash after doing an xalloc & strcpy ??
+ * This once has caused the server to crash after doing a malloc & strcpy ??
*/
return Success;
}
@@ -541,12 +541,12 @@ static InputInfoPtr xf86FpitAllocate(InputDriverPtr drv)
{
InputInfoPtr pInfo;
FpitPrivatePtr priv;
- priv = xalloc(sizeof(FpitPrivateRec));
+ priv = malloc(sizeof(FpitPrivateRec));
if (!priv)
return NULL;
pInfo = xf86AllocateInput(drv, 0);
if (!pInfo) {
- xfree(priv);
+ free(priv);
return NULL;
}
@@ -583,8 +583,8 @@ static void xf86FpitUninit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
{
FpitPrivatePtr priv = (FpitPrivatePtr) pInfo->private;
xf86FpitControl(pInfo->dev, DEVICE_OFF);
- xfree(priv->fpitDev);
- xfree(priv);
+ free(priv->fpitDev);
+ free(priv);
pInfo->private = NULL;
xf86DeleteInput(pInfo, 0);
}
@@ -613,9 +613,9 @@ static InputInfoPtr xf86FpitInit(InputDriverPtr drv, IDevPtr dev, int flags)
xf86Msg(X_ERROR, "%s: No Device specified in FPIT module config.\n", dev->identifier);
if (priv) {
if (priv->fpitDev) {
- xfree(priv->fpitDev);
+ free(priv->fpitDev);
}
- xfree(priv);
+ free(priv);
}
return pInfo;
}