Fixed undefined behavior in testing infrastructure

Makefile

@@ -5,7 +5,7 @@ CC = gcc
 EMCC = /usr/lib/emscripten/emcc
 EMCONF = /usr/lib/emscripten/emconfigure
 SDLINC = /usr/include/SDL2
-CFLAGS = -Wall -Wextra -Werror -Wno-unused-function -Wno-unused-parameter -pipe -D_XOPEN_SOURCE=500 -std=c11 -fPIC -I$(INCDIR) -I$(SDLINC)  -ggdb3 -O0
+CFLAGS = -Wall -Wextra -Werror -Wno-unused-function -Wno-unused-parameter -pipe -D_XOPEN_SOURCE=500 -std=c11 -fPIC -I$(INCDIR) -I$(SDLINC)  -ggdb3 -O2
 TARGET = lib$(NAME).so
 
 SRCDIR  = src

src/bst.c

@@ -752,7 +752,7 @@ void testBSTModule(void) {
 /* Private functions */
 
 static void testStringBST(void) {
-   BST bst, bst2;
+   BST volatile bst, bst2;
 
    trace(bst = newBST(string));
    trace(insertArray(bst, ELEMENTS, N_ELEMENTS));
@@ -770,7 +770,7 @@ static void testStringBST(void) {
 }
 
 static void testIntBST(void) {
-   BST bst, bst2;
+   BST volatile bst, bst2;
 
    trace(bst = newBST(int));
    trace(insertArray(bst, PRIMES, N_PRIMES));

src/charset.c

@@ -269,8 +269,8 @@ static CharSet createCharSet(string str);
 /* Unit test */
 
 void testCharSetModule(void) {
-   CharSet vowels, consonants, lowercase, onePointTiles, onePointConsonants;
-   CharSet set;
+   CharSet volatile vowels, consonants, lowercase, onePointTiles, onePointConsonants;
+   CharSet volatile set;
 
    trace(vowels = createCharSet("aeiou"));
    trace(consonants = createCharSet("bcdfghjklmnpqrstvwxyz"));

src/gevents.c

@@ -344,7 +344,7 @@ GTimer getGTimer(GEvent e) {
 /* Unit test */
 
 void testGEventsModule(void) {
-    GEvent e;
+    GEvent volatile e;
 
     trace(e = newGMouseEvent(MOUSE_CLICKED, NULL, 2.3, 4.5));
     test(getEventClass(e), (int) MOUSE_EVENT);

src/graph.c

@@ -356,7 +356,7 @@ static void linkNodesAlphabetically(Graph g) {
 
 static void testNodeIterator(Graph g) {
    Node node;
-   int count;
+   int volatile count;
 
    count = 0;
    reportMessage("foreach (node in getNodes(g)) {");
@@ -373,7 +373,7 @@ static void testNodeIterator(Graph g) {
 
 static void testArcIterator(Graph g) {
    Arc arc;
-   int count;
+   int volatile count;
 
    count = 0;
    reportMessage("foreach (arc in getArcSet(g)) {");
@@ -390,7 +390,7 @@ static void testArcIterator(Graph g) {
 
 static void testArcsFrom(Graph g) {
    Arc arc;
-   int count;
+   int volatile count;
 
    count = 0;
    reportMessage("foreach (arc in getArcSet(getNode(g, \"A\"))) {");
@@ -407,7 +407,7 @@ static void testArcsFrom(Graph g) {
 
 static void testNeighbors(Graph g) {
    Node node;
-   int count;
+   int volatile count;
 
    count = 0;
    reportMessage("foreach (node in getNeighbors(getNode(g, \"A\"))) {");

src/hashmap.c

@@ -205,8 +205,8 @@ static int hashCode(string str) {
 }
 
 static void rehash(HashMap map, int nBuckets) {
-   Cell **oldBuckets, *cp, *np;
-   int oldNBuckets, bucket, i;
+   Cell ** volatile oldBuckets, *cp, *np;
+   int oldNBuckets = 0, bucket, i;
 
    if (map->count != 0) {
       oldBuckets = map->buckets;
@@ -292,7 +292,7 @@ static void markElement(string name, int *bitSet);
 /* Unit test */
 
 void testHashMapModule(void) {
-   HashMap map, map2;
+   HashMap volatile map, map2;
    string key;
    int bits;
 

src/map.c

@@ -153,9 +153,9 @@ static void addKeyToIterator(BSTNode node, void *data) {
 #ifndef _NOTEST_
 
 void testMapModule(void) {
-   Map map, map2;
+   Map volatile map, map2;
    string key;
-   string str;
+   string volatile str;
 
    trace(map = newMap());
    test(size(map), 0);

src/options.c

@@ -302,8 +302,8 @@ static string OPTIONS[] = {
 };
 
 void testOptionsModule(void) {
-   string *args;
-   HashMap options;
+   string * volatile args;
+   HashMap volatile options;
 
    trace(args = parseShellArgs("-count 3 -size 1.5 -trace on -v a0 a1"));
    trace(options = parseOptions(args, OPTIONS));

src/pqueue.c

@@ -218,7 +218,7 @@ static void swapHeapEntries(PriorityQueue pq, int i1, int i2) {
 /* Unit test */
 
 void testPriorityQueueModule(void) {
-   PriorityQueue pq, pq2;
+   PriorityQueue volatile pq, pq2;
 
    trace(pq = newPriorityQueue());
    test(size(pq), 0);

src/queue.c

@@ -150,7 +150,7 @@ Queue cloneQueue(Queue queue) {
 /* Unit test */
 
 void testQueueModule(void) {
-   Queue queue, queue2;
+   Queue volatile queue, queue2;
 
    trace(queue = newQueue());
    test(isEmpty(queue), true);

src/set.c

@@ -345,7 +345,7 @@ void testSetModule(void) {
 }
 
 static void testCharacterSet(void) {
-   Set vowels, consonants, lowercase, onePointTiles, onePointConsonants;
+   Set volatile vowels, consonants, lowercase, onePointTiles, onePointConsonants;
 
    trace(vowels = createCharSet("aeiou"));
    trace(consonants = createCharSet("bcdfghjklmnpqrstvwxyz"));
@@ -372,7 +372,7 @@ static Set createCharSet(string str) {
 }
 
 static void testStringSet() {
-   Set ospd3, ospd4, newWords, set;
+   Set volatile ospd3, ospd4, newWords, set;
 
    trace(ospd3 = newSet(string));
    test(isEmpty(ospd3), true);
@@ -414,7 +414,7 @@ static void addStringsToSet(Set set, string array[], int n) {
 }
 
 static void testIntegerSet() {
-   Set primes, evens, odds, set;
+   Set volatile primes, evens, odds, set;
 
    trace(primes = createDigitSet("2357"));
    trace(evens = createDigitSet("02468"));

src/stack.c

@@ -153,7 +153,7 @@ static void expandCapacity(Stack stack) {
 /* Unit test */
 
 void testStackModule(void) {
-   Stack stack, stack2;
+   volatile Stack stack, stack2;
 
    trace(stack = newStack());
    test(isEmpty(stack), true);

src/strbuf.c

@@ -130,13 +130,12 @@ string getString(StringBuffer sb) {
 /* Friend functions */
 
 int printfCapacity(string format, va_list args) {
-   int i, capacity, width, precision, len, lcount;
-   bool inFormat, dotSeen;
+   int i, capacity, width = 0, precision = 0, len, lcount = 0;
+   bool inFormat = false, dotSeen = false;
    string str;
    char ch;
 
    capacity = 0;
-   inFormat = false;
    for (i = 0; format[i] != '\0'; i++) {
       ch = format[i];
       if (!inFormat) {
@@ -268,7 +267,7 @@ static int testCapacity(string format, ...);
 /* Unit test */
 
 void testStrbufModule(void) {
-   string alphabet;
+   string volatile alphabet;
 
    testStringBufferAppend();
    testStringBufferFormat();

src/tokenscanner.c

@@ -613,8 +613,8 @@ static void testStringScanner(void) {
 }
 
 static void testStreamScanner(void) {
-   TokenScanner scanner;
-   FILE *infile;
+   TokenScanner volatile scanner;
+   FILE * volatile infile;
 
    trace(scanner = newTokenScanner());
    trace(infile = fopen("include/tokenscanner.h", "r"));
@@ -643,8 +643,8 @@ static void testStreamScanner(void) {
 }
 
 static void testScannerNoOptions(void) {
-   TokenScanner scanner;
-   string token;
+   TokenScanner volatile scanner;
+   string volatile token;
 
    trace(scanner = newTokenScanner());
    trace(setInputString(scanner, "cout << \"pi = \" << 3.14159265 << endl;"));
@@ -683,8 +683,8 @@ static void testScannerNoOptions(void) {
 }
 
 static void testScannerLanguageOptions(void) {
-   TokenScanner scanner;
-   string token;
+   TokenScanner volatile scanner;
+   string volatile token;
 
    trace(scanner = newTokenScanner());
    trace(ignoreWhitespace(scanner));
@@ -738,7 +738,7 @@ static void testScannerLanguageOptions(void) {
 }
 
 static void testScanNumbers(void) {
-   TokenScanner scanner;
+   TokenScanner volatile scanner;
 
    trace(scanner = newTokenScanner());
    trace(ignoreWhitespace(scanner));
@@ -755,8 +755,8 @@ static void testScanNumbers(void) {
 }
 
 static void testScanEscapeSequences(void) {
-   TokenScanner scanner;
-   string token;
+   TokenScanner volatile scanner;
+   string volatile token;
 
    trace(scanner = newTokenScanner());
    trace(scanStrings(scanner));

src/vector.c

@@ -260,7 +260,7 @@ static Iterator newVectorIterator(void *collection) {
 /* Unit test */
 
 void testVectorModule(void) {
-   Vector vec, vec2;
+   Vector volatile vec, vec2;
 
    trace(vec = newVector());
    test(isEmpty(vec), true);