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, 5 insertions, 5 deletions

diff --git a/keytypes.c b/keytypes.c
index a8aaadd..707ee6f 100644
--- a/keytypes.c
+++ b/keytypes.c
@@ -525,9 +525,9 @@ NextMapEntry(KeyTypeInfo * type)
     else if (type->nEntries >= type->szEntries)
     {
         type->szEntries *= 2;
-        type->entries = uTypedRecalloc(type->entries,
-                                       type->nEntries, type->szEntries,
-                                       XkbKTMapEntryRec);
+        type->entries = recallocarray(type->entries,
+                                      type->nEntries, type->szEntries,
+                                      sizeof(XkbKTMapEntryRec));
         if (type->entries == NULL)
         {
             ERROR("Couldn't reallocate map entries for %s\n", TypeTxt(type));
@@ -787,8 +787,8 @@ AddLevelName(KeyTypeInfo * type,
 {
     if ((type->lvlNames == NULL) || (type->szNames <= level))
     {
-        type->lvlNames =
-            uTypedRecalloc(type->lvlNames, type->szNames, level + 1, Atom);
+        type->lvlNames = recallocarray(type->lvlNames, type->szNames,
+                                       level + 1, sizeof(Atom));
         if (type->lvlNames == NULL)
         {
             ERROR("Couldn't allocate level names for type %s\n",