From cefec39d93846c2d034be9a89f48466831eddde6 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue, 27 May 2014 20:30:20 -0700
Subject: Replace custom uAlloc/uCalloc with plain malloc/calloc

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
---
 psgeom.c   |  4 ++--
 utils.c    | 19 +------------------
 utils.h    |  9 ---------
 xkbprint.c | 14 +++++++-------
 4 files changed, 10 insertions(+), 36 deletions(-)

diff --git a/psgeom.c b/psgeom.c
index 0365cee..1265a5c 100644
--- a/psgeom.c
+++ b/psgeom.c
@@ -869,7 +869,7 @@ PSPageTrailer(FILE *out, PSState *state)
             if (sName == NULL)
                 sName = "(unknown)";
 
-            lbuf = uAlloc(10 + strlen(sName));
+            lbuf = malloc(10 + strlen(sName));
             if (!lbuf) {
                 uFatalError("Can't allocate memory for string\n");
             }
@@ -904,7 +904,7 @@ PSPageTrailer(FILE *out, PSState *state)
             if (sName == NULL)
                 sName = "(unknown)";
 
-            lbuf = uAlloc(12 + strlen(sName));
+            lbuf = malloc(12 + strlen(sName));
             if (!lbuf) {
                 uFatalError("Can't allocate memory for string\n");
             }
diff --git a/utils.c b/utils.c
index 240ac1b..b813863 100644
--- a/utils.c
+++ b/utils.c
@@ -34,23 +34,6 @@
 unsigned int debugFlags;
 
 
-/***====================================================================***/
-
-Opaque
-uAlloc(unsigned size)
-{
-    return ((Opaque) malloc(size));
-}
-
-/***====================================================================***/
-
-Opaque
-uCalloc(unsigned n, unsigned size)
-{
-    return ((Opaque) calloc(n, size));
-}
-
-
 /***====================================================================***/
 
 static FILE *errorFile = NULL;
@@ -172,7 +155,7 @@ uStringDup(const char *str)
 
     if (str == NULL)
         return NULL;
-    rtrn = (char *) uAlloc(strlen(str) + 1);
+    rtrn = (char *) malloc(strlen(str) + 1);
     strcpy(rtrn, str);
     return rtrn;
 }
diff --git a/utils.h b/utils.h
index c277d33..d9cf438 100644
--- a/utils.h
+++ b/utils.h
@@ -74,15 +74,6 @@ typedef int Comparison;
 #endif
 
 
-/***====================================================================***/
-
-extern Opaque uAlloc(unsigned    /* size */);
-extern Opaque uCalloc(unsigned   /* n */ ,
-                      unsigned   /* size */);
-
-#define	uTypedAlloc(t)		((t *)uAlloc((unsigned)sizeof(t)))
-#define	uTypedCalloc(n,t)	((t *)uCalloc((unsigned)n,(unsigned)sizeof(t)))
-
 /***====================================================================***/
 
 extern Boolean uSetErrorFile(const char *name);
diff --git a/xkbprint.c b/xkbprint.c
index 3b55fbd..41ebec3 100644
--- a/xkbprint.c
+++ b/xkbprint.c
@@ -421,7 +421,7 @@ parseArgs(int argc, char *argv[])
         FILE *file = NULL;
 
         if (outputFile == NULL) {
-            outputFile = uAlloc(strlen(outputFont) + 5);
+            outputFile = malloc(strlen(outputFont) + 5);
             sprintf(outputFile, "%s.pfa", outputFont);
         }
         else if (uStringEqual(outputFile, "-"))
@@ -484,10 +484,10 @@ parseArgs(int argc, char *argv[])
         outputFormat = WANT_PS_FILE;
     if ((outputFile == NULL) && (inputFile != NULL) &&
         uStringEqual(inputFile, "-")) {
-        int len;
+        size_t len;
 
         len = strlen("stdin.eps") + 2;
-        outputFile = uTypedCalloc(len, char);
+        outputFile = calloc(len, sizeof(char));
 
         if (outputFile == NULL) {
             uInternalError("Cannot allocate space for output file name\n");
@@ -500,7 +500,7 @@ parseArgs(int argc, char *argv[])
             sprintf(outputFile, "stdin.ps");
     }
     else if ((outputFile == NULL) && (inputFile != NULL)) {
-        int len;
+        size_t len;
         char *base, *ext;
 
         base = strrchr(inputFile, '/');
@@ -510,7 +510,7 @@ parseArgs(int argc, char *argv[])
             base++;
 
         len = strlen(base) + strlen("eps") + 2;
-        outputFile = uTypedCalloc(len, char);
+        outputFile = calloc(len, sizeof(char));
 
         if (outputFile == NULL) {
             uInternalError("Cannot allocate space for output file name\n");
@@ -533,7 +533,7 @@ parseArgs(int argc, char *argv[])
         }
     }
     else if (outputFile == NULL) {
-        int len;
+        size_t len;
         char *ch, *name, buf[128];
 
         if (inDpyName[0] == ':')
@@ -542,7 +542,7 @@ parseArgs(int argc, char *argv[])
             name = inDpyName;
 
         len = strlen(name) + strlen("eps") + 2;
-        outputFile = uTypedCalloc(len, char);
+        outputFile = calloc(len, sizeof(char));
 
         if (outputFile == NULL) {
             uInternalError("Cannot allocate space for output file name\n");
-- 
cgit v1.2.3