summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2010-11-17 08:47:06 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2010-11-17 08:56:41 +1000
commit0b8294402d7658ccab7c48e2d0fd824cb1d1a660 (patch)
treec2f6b0f8f076e0363c7f8b612a9e265deb8595c3
parentb95816938977ac84224433ac23e2ab24cd29d8f5 (diff)
Remove libcwrappers for free() and malloc().
The future is here! Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/xf86HyperPen.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/xf86HyperPen.c b/src/xf86HyperPen.c
index 09526b6..292df86 100644
--- a/src/xf86HyperPen.c
+++ b/src/xf86HyperPen.c
@@ -913,7 +913,7 @@ static InputInfoPtr
xf86HypAllocate(void)
{
InputInfoPtr pInfo = xf86AllocateInput(hypDrv, 0);
- HyperPenDevicePtr priv = (HyperPenDevicePtr)xalloc(sizeof(HyperPenDeviceRec));
+ HyperPenDevicePtr priv = (HyperPenDevicePtr)malloc(sizeof(HyperPenDeviceRec));
#if defined (sun) && !defined(i386)
char *dev_name = getenv("HYPERPEN_DEV");
#endif
@@ -937,7 +937,7 @@ xf86HypAllocate(void)
#if defined(sun) && !defined(i386)
if (dev_name) {
- priv->hypDevice = (char *)xalloc(strlen(dev_name) + 1);
+ priv->hypDevice = (char *)alloc(strlen(dev_name) + 1);
strcpy(priv->hypDevice, dev_name);
ErrorF("xf86HypOpen port changed to '%s'\n", priv->hypDevice);
} else {
@@ -981,7 +981,7 @@ xf86HypUninit(InputDriverPtr drv,
xf86HypProc(pInfo->dev, DEVICE_OFF);
- xfree (priv);
+ free (priv);
xf86DeleteInput(pInfo, 0);
}
@@ -1140,9 +1140,9 @@ xf86HypInit(InputDriverPtr drv,
SetupProc_fail:
if (priv)
- xfree(priv);
+ free(priv);
if (pInfo)
- xfree(pInfo);
+ free(pInfo);
return NULL;
}