Changeset 452 for trunk/src/zAVLTree.c

Timestamp:

Jun 26, 2014, 8:01:54 PM (10 years ago)

Author:

katerina

Message:

Fix for ticket #353 (multiple exclusions for SUID check).

File:

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

trunk/src/zAVLTree.c

@@ -33 +33 @@
 #include "zAVLTree.h"
 
+/* Interface for handling "string only" items rw 2014-06-26
+ */
+static zAVLKey zstring_key (void const * arg)
+{
+  return (zAVLKey) arg;
+}
+static void zfree_string (void * inptr)
+{
+  char * str = (char *) inptr;
+  str[0] = '\0';
+  free (str);
+  return;
+}
+void zAVL_string_reset (zAVLTree * tree)
+{
+  if (tree)
+    zAVLFreeTree (tree, zfree_string);
+  return;
+}
+int zAVL_string_set (zAVLTree ** tree, const char * key)
+{
+  if (tree && key)
+    {
+      zAVLTree * itree = (*tree);
+      if (!itree)
+        {
+          itree = zAVLAllocTree (zstring_key, zAVL_KEY_STRING);
+          if (!itree) 
+            {
+              return -1;
+            }
+        }
+      *tree = itree;
+      return zAVLInsert (itree, strdup(key));
+    }
+  return -1;
+}
+char * zAVL_string_get (zAVLTree * tree, char * key)
+{
+  /* zAVLSearch() checks for NULL tree 
+   */
+  if (key)
+    {
+      return ((char *) zAVLSearch (tree, key));
+    }
+  return NULL;
+}
+
+
 /* Wed Nov 23 17:57:42 CET 2005 rw: introduce third argument in
  * zAVLCloseSearchNode() to avoid redundant strcmp
@@ -86 +135 @@
   zAVLTree *rc;
 
-  rc = malloc(sizeof(zAVLTree));
+  rc = calloc(1, sizeof(zAVLTree));
   if (rc == NULL)
     return NULL;
@@ -130 +179 @@
   int       ok;
 
-  newnode = malloc(sizeof(zAVLNode));
+  newnode = calloc(1, sizeof(zAVLNode));
   if (newnode == NULL)
     return -1;