Changeset 474 for trunk/src/zAVLTree.c

Timestamp:

May 30, 2015, 7:57:16 PM (9 years ago)

Author:

katerina

Message:

Fix for ticket #372 (Replace obsolete smatch by clang in test suite).

File:

• trunk/src/zAVLTree.c (modified) (2 diffs)

trunk/src/zAVLTree.c

@@ -39 +39 @@
   return (zAVLKey) arg;
 }
+
 static char * dummy_zfree_string;
+#ifdef __clang__
+static char * dummy_zfree_str;
+#endif
+
 static void zfree_string (void * inptr)
 {
+#ifdef __clang__
+  dummy_zfree_str = (char *) inptr;
+#else
   char * str = (char *) inptr;
+#endif
 
   /* Take the address to circumvent gcc 4.9 optimizer bug */
   dummy_zfree_string = (char *) &inptr;
 
+#ifdef __clang__
+  dummy_zfree_str[0] = '\0';
+  free (dummy_zfree_str);
+#else
   str[0] = '\0';
   free (inptr);
+#endif
   return;
 }
@@ -537 +551 @@
   if (avlnode->right)
     zAVLFreeBranch(avlnode->right, freeitem);
-  if (freeitem)
+  if (freeitem) {
     freeitem(avlnode->item);
+    avlnode->item = NULL;
+  }
   free(avlnode);
 }