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

diff --git a/symbols.c b/symbols.c
index b026ce7..310ad07 100644
--- a/symbols.c
+++ b/symbols.c
@@ -297,18 +297,18 @@ ResizeKeyGroup(KeyInfo * key,
 
     if ((key->syms[group] == NULL) || tooSmall)
     {
-        key->syms[group] = uTypedRecalloc(key->syms[group],
-                                          key->numLevels[group], newWidth,
-                                          KeySym);
+        key->syms[group] = recallocarray(key->syms[group],
+                                         key->numLevels[group], newWidth,
+                                         sizeof(KeySym));
         if (!key->syms[group])
             return False;
     }
     if (((forceActions) && (tooSmall || (key->acts[group] == NULL))) ||
         (tooSmall && (key->acts[group] != NULL)))
     {
-        key->acts[group] = uTypedRecalloc(key->acts[group],
-                                          key->numLevels[group], newWidth,
-                                          XkbAction);
+        key->acts[group] = recallocarray(key->acts[group],
+                                         key->numLevels[group], newWidth,
+                                         sizeof(XkbAction));
         if (!key->acts[group])
             return False;
     }
@@ -607,8 +607,8 @@ AddKeySymbols(SymbolsInfo * info, KeyInfo * key, XkbDescPtr xkb)
     if (info->nKeys >= info->szKeys)
     {
         info->szKeys += SYMBOLS_CHUNK;
-        info->keys =
-            uTypedRecalloc(info->keys, info->nKeys, info->szKeys, KeyInfo);
+        info->keys = recallocarray(info->keys, info->nKeys, info->szKeys,
+                                   sizeof(KeyInfo));
         if (!info->keys)
         {
             WSGO("Could not allocate key symbols descriptions\n");