[PATCH penmount 03/10] Drop libc wrappers for free, malloc

Peter Hutterer peter.hutterer at who-t.net
Wed Dec 1 20:37:50 PST 2010


Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/xf86PM.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/xf86PM.c b/src/xf86PM.c
index 1ba947f..328ad28 100644
--- a/src/xf86PM.c
+++ b/src/xf86PM.c
@@ -413,14 +413,14 @@ static InputInfoPtr
 PenMountPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
 {              
 	InputInfoPtr pInfo;
-   	PenMountPrivatePtr priv = xcalloc (1, sizeof (PenMountPrivateRec));
+	PenMountPrivatePtr priv = calloc (1, sizeof (PenMountPrivateRec));
 	char *s;
 
 	if (!priv)
 		return NULL;
 
 	if (!(pInfo = xf86AllocateInput(drv, 0))) {
-		xfree(priv);
+		free(priv);
 		return NULL;
 	}
   
@@ -512,12 +512,12 @@ PenMountPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
 	if ((pInfo) && (pInfo->fd))
 		xf86CloseSerial (pInfo->fd);
 	if ((pInfo) && (pInfo->name))
-		xfree (pInfo->name);
+		free (pInfo->name);
 
 	if ((priv) && (priv->buffer))
 		XisbFree (priv->buffer);
 	if (priv)
-		xfree (priv);
+		free (priv);
 	return (pInfo);
 }
 
-- 
1.7.3.2



More information about the xorg-devel mailing list