Replace uTypedRecalloc() with direct recallocarray() calls

Retains uRecalloc() as a fallback for platforms without recallocarray()

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

1 files changed, 7 insertions, 5 deletions

diff --git a/utils.c b/utils.c
index 61f04b6..120ef13 100644
--- a/utils.c
+++ b/utils.c
@@ -33,23 +33,25 @@
 
 /***====================================================================***/
 
-Opaque
-uRecalloc(Opaque old, unsigned nOld, unsigned nNew, unsigned itemSize)
+#ifndef HAVE_RECALLOCARRAY
+void *
+uRecalloc(void *old, size_t nOld, size_t nNew, size_t itemSize)
 {
     char *rtrn;
 
     if (old == NULL)
-        rtrn = (char *) calloc(nNew, itemSize);
+        rtrn = calloc(nNew, itemSize);
     else
     {
-        rtrn = (char *) realloc((char *) old, nNew * itemSize);
+        rtrn = reallocarray(old, nNew, itemSize);
         if ((rtrn) && (nNew > nOld))
         {
             bzero(&rtrn[nOld * itemSize], (nNew - nOld) * itemSize);
         }
     }
-    return (Opaque) rtrn;
+    return (void *) rtrn;
 }
+#endif
 
 /***====================================================================***/