Replace X-allocation functions with their C89 counterparts

The only remaining X-functions used in server are XNF*, the rest is converted to
plain alloc/calloc/realloc/free/strdup.

X* functions are still exported from server and x* macros are still defined in
header file, so both ABI and API are not affected by this change.

Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>

1 files changed, 3 insertions, 3 deletions

diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index a201731f3..5d3372da2 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -58,7 +58,7 @@ char *new;
    
    if (str==NULL)
 	return NULL;
-   new= xcalloc(strlen(str)+1,sizeof(char));
+   new= calloc(strlen(str)+1,sizeof(char));
    if (new)
 	strcpy(new,str);
    return new;
@@ -74,10 +74,10 @@ int	newCount= *newCountRtrn;
     if (oldPtr==NULL) {
 	if (newCount==0)
 	    return NULL;
-	oldPtr= xcalloc(newCount,elemSize);
+	oldPtr= calloc(newCount,elemSize);
     }
     else if (oldCount<newCount) {
-	oldPtr= xrealloc(oldPtr,newCount*elemSize);
+	oldPtr= realloc(oldPtr,newCount*elemSize);
 	if (oldPtr!=NULL) {
 	    char *tmp= (char *)oldPtr;
 	    bzero(&tmp[oldCount*elemSize],(newCount-oldCount)*elemSize);