Replace uCalloc() and uTypedCalloc() with direct calloc() calls

All these wrappers did was mess with types.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/xkbcomp.c b/xkbcomp.c
index b39ac79..0ecccc3 100644
--- a/xkbcomp.c
+++ b/xkbcomp.c
@@ -760,7 +760,7 @@ parseArgs(int argc, char *argv[])
     else if ((!outputFile) && (inputFile) && (strcmp(inputFile, "-") == 0))
     {
         int len = strlen("stdin") + strlen(fileTypeExt[outputFormat]) + 2;
-        outputFile = uTypedCalloc(len, char);
+        outputFile = calloc(len, sizeof(char));
         if (outputFile == NULL)
         {
             WSGO("Cannot allocate space for output file name\n");
@@ -786,7 +786,7 @@ parseArgs(int argc, char *argv[])
             base = inputMap;
 
         len = strlen(base) + strlen(fileTypeExt[outputFormat]) + 2;
-        outputFile = uTypedCalloc(len, char);
+        outputFile = calloc(len, sizeof(char));
         if (outputFile == NULL)
         {
             WSGO("Cannot allocate space for output file name\n");
@@ -812,7 +812,7 @@ parseArgs(int argc, char *argv[])
             name = inDpyName;
 
         len = strlen(name) + strlen(fileTypeExt[outputFormat]) + 2;
-        outputFile = uTypedCalloc(len, char);
+        outputFile = calloc(len, sizeof(char));
         if (outputFile == NULL)
         {
             WSGO("Cannot allocate space for output file name\n");