Make XkbcInitAtoms() call optional

1 files changed, 9 insertions, 10 deletions

diff --git a/src/atom.c b/src/atom.c
index f50b9e7..baab640 100644
--- a/src/atom.c
+++ b/src/atom.c
@@ -105,13 +105,6 @@ XkbcInitAtoms(InternAtomFuncPtr intern, GetAtomValueFuncPtr get_atom_value)
         do_get_atom_value = get_atom_value;
         return;
     }
-
-    if (nodeTable)
-        return;
-
-    tableLength = InitialTableSize;
-    nodeTable = (NodePtr *)malloc(InitialTableSize * sizeof(NodePtr));
-    nodeTable[None] = NULL;
 }
 
 static const char *
@@ -202,16 +195,22 @@ _XkbcMakeAtom(const char *string, unsigned len, Bool makeit)
 
         if ((lastAtom + 1) >= tableLength) {
             NodePtr *table;
+	    int newLength;
+
+	    if (tableLength == 0)
+		newLength = InitialTableSize;
+	    else
+		newLength = tableLength * 2;
 
-            table = (NodePtr *)realloc(nodeTable,
-                                           tableLength * 2 * sizeof(NodePtr));
+            table = realloc(nodeTable, newLength * sizeof(NodePtr));
             if (!table) {
                 if (nd->string != string)
                     free(nd->string);
                 free(nd);
                 return BAD_RESOURCE;
             }
-            tableLength <<= 1;
+            tableLength = newLength;
+	    table[None] = NULL;
 
             nodeTable = table;
         }