From 5cf70183812541b33a6e83c7e1e3bc6198730cbe Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 5 May 2009 21:00:31 +1000
Subject: xkb: remove _XkbAlloc, _XkbCalloc, _XkbRealloc and _XkbFree

We all agree that wrapping is fun, but seriously. One of these days someone
will get hurt.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 xkb/xkmread.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'xkb/xkmread.c')

diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index dc8ab612d..206c40382 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -57,7 +57,7 @@ char *new;
    
    if (str==NULL)
 	return NULL;
-   new= (char *)_XkbCalloc(strlen(str)+1,sizeof(char));
+   new= xcalloc(strlen(str)+1,sizeof(char));
    if (new)
 	strcpy(new,str);
    return new;
@@ -73,10 +73,10 @@ int	newCount= *newCountRtrn;
     if (oldPtr==NULL) {
 	if (newCount==0)
 	    return NULL;
-	oldPtr= _XkbCalloc(newCount,elemSize);
+	oldPtr= xcalloc(newCount,elemSize);
     }
     else if (oldCount<newCount) {
-	oldPtr= _XkbRealloc(oldPtr,newCount*elemSize);
+	oldPtr= xrealloc(oldPtr,newCount*elemSize);
 	if (oldPtr!=NULL) {
 	    char *tmp= (char *)oldPtr;
 	    bzero(&tmp[oldCount*elemSize],(newCount-oldCount)*elemSize);
-- 
cgit v1.2.3