fix
[oweals/gnunet.git] / src / util / container_multihashmap.c
index 5b66442cb953ff98d911e0bb4c185274f743f79a..60d4a43d5231730a64e215aa51b4d7ba985bcf4c 100644 (file)
@@ -28,6 +28,8 @@
 #include "gnunet_container_lib.h"
 #include "gnunet_crypto_lib.h"
 
+#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
+
 /**
  * An entry in the hash map.
  */
@@ -101,7 +103,7 @@ GNUNET_CONTAINER_multihashmap_create (unsigned int len)
  */
 void
 GNUNET_CONTAINER_multihashmap_destroy (struct GNUNET_CONTAINER_MultiHashMap
-                                       *map)
+                                      *map)
 {
   unsigned int i;
   struct MapEntry *e;
@@ -109,10 +111,10 @@ GNUNET_CONTAINER_multihashmap_destroy (struct GNUNET_CONTAINER_MultiHashMap
   for (i = 0; i < map->map_length; i++)
     {
       while (NULL != (e = map->map[i]))
-        {
-          map->map[i] = e->next;
-          GNUNET_free (e);
-        }
+       {
+         map->map[i] = e->next;
+         GNUNET_free (e);
+       }
     }
   GNUNET_free (map->map);
   GNUNET_free (map);
@@ -128,8 +130,9 @@ GNUNET_CONTAINER_multihashmap_destroy (struct GNUNET_CONTAINER_MultiHashMap
  */
 static unsigned int
 idx_of (const struct GNUNET_CONTAINER_MultiHashMap *m,
-        const GNUNET_HashCode * key)
+       const GNUNET_HashCode * key)
 {
+  GNUNET_assert (m != NULL);
   return (*(unsigned int *) key) % m->map_length;
 }
 
@@ -142,7 +145,7 @@ idx_of (const struct GNUNET_CONTAINER_MultiHashMap *m,
  */
 unsigned int
 GNUNET_CONTAINER_multihashmap_size (const struct GNUNET_CONTAINER_MultiHashMap
-                                    *map)
+                                   *map)
 {
   return map->size;
 }
@@ -160,7 +163,7 @@ GNUNET_CONTAINER_multihashmap_size (const struct GNUNET_CONTAINER_MultiHashMap
  */
 void *
 GNUNET_CONTAINER_multihashmap_get (const struct GNUNET_CONTAINER_MultiHashMap
-                                   *map, const GNUNET_HashCode * key)
+                                  *map, const GNUNET_HashCode * key)
 {
   struct MapEntry *e;
 
@@ -168,7 +171,7 @@ GNUNET_CONTAINER_multihashmap_get (const struct GNUNET_CONTAINER_MultiHashMap
   while (e != NULL)
     {
       if (0 == memcmp (key, &e->key, sizeof (GNUNET_HashCode)))
-        return e->value;
+       return e->value;
       e = e->next;
     }
   return NULL;
@@ -186,9 +189,9 @@ GNUNET_CONTAINER_multihashmap_get (const struct GNUNET_CONTAINER_MultiHashMap
  */
 int
 GNUNET_CONTAINER_multihashmap_iterate (const struct
-                                       GNUNET_CONTAINER_MultiHashMap *map,
-                                       GNUNET_CONTAINER_HashMapIterator it,
-                                       void *it_cls)
+                                      GNUNET_CONTAINER_MultiHashMap *map,
+                                      GNUNET_CONTAINER_HashMapIterator it,
+                                      void *it_cls)
 {
   int count;
   unsigned int i;
@@ -197,20 +200,21 @@ GNUNET_CONTAINER_multihashmap_iterate (const struct
   GNUNET_HashCode kc;
 
   count = 0;
+  GNUNET_assert (map != NULL);
   for (i = 0; i < map->map_length; i++)
     {
       n = map->map[i];
       while (NULL != (e = n))
-        {
+       {
          n = e->next;
-          if (NULL != it)
+         if (NULL != it)
            {
              kc = e->key;
              if (GNUNET_OK != it (it_cls, &kc, e->value))
                return GNUNET_SYSERR;
            }
-          count++;
-        }
+         count++;
+       }
     }
   return count;
 }
@@ -229,8 +233,8 @@ GNUNET_CONTAINER_multihashmap_iterate (const struct
  */
 int
 GNUNET_CONTAINER_multihashmap_remove (struct GNUNET_CONTAINER_MultiHashMap
-                                      *map, const GNUNET_HashCode * key,
-                                      void *value)
+                                     *map, const GNUNET_HashCode * key,
+                                     void *value)
 {
   struct MapEntry *e;
   struct MapEntry *p;
@@ -242,16 +246,16 @@ GNUNET_CONTAINER_multihashmap_remove (struct GNUNET_CONTAINER_MultiHashMap
   while (e != NULL)
     {
       if ((0 == memcmp (key, &e->key, sizeof (GNUNET_HashCode))) &&
-          (value == e->value))
-        {
-          if (p == NULL)
-            map->map[i] = e->next;
-          else
-            p->next = e->next;
-          GNUNET_free (e);
-          map->size--;
-          return GNUNET_YES;
-        }
+         (value == e->value))
+       {
+         if (p == NULL)
+           map->map[i] = e->next;
+         else
+           p->next = e->next;
+         GNUNET_free (e);
+         map->size--;
+         return GNUNET_YES;
+       }
       p = e;
       e = e->next;
     }
@@ -269,7 +273,7 @@ GNUNET_CONTAINER_multihashmap_remove (struct GNUNET_CONTAINER_MultiHashMap
  */
 int
 GNUNET_CONTAINER_multihashmap_remove_all (struct GNUNET_CONTAINER_MultiHashMap
-                                          *map, const GNUNET_HashCode * key)
+                                         *map, const GNUNET_HashCode * key)
 {
   struct MapEntry *e;
   struct MapEntry *p;
@@ -283,24 +287,24 @@ GNUNET_CONTAINER_multihashmap_remove_all (struct GNUNET_CONTAINER_MultiHashMap
   while (e != NULL)
     {
       if (0 == memcmp (key, &e->key, sizeof (GNUNET_HashCode)))
-        {
-          if (p == NULL)
-            map->map[i] = e->next;
-          else
-            p->next = e->next;
-          GNUNET_free (e);
-          map->size--;
-          if (p == NULL)
-            e = map->map[i];
-          else
-            e = p->next;
-          ret++;
-        }
+       {
+         if (p == NULL)
+           map->map[i] = e->next;
+         else
+           p->next = e->next;
+         GNUNET_free (e);
+         map->size--;
+         if (p == NULL)
+           e = map->map[i];
+         else
+           e = p->next;
+         ret++;
+       }
       else
-        {
-          p = e;
-          e = e->next;
-        }
+       {
+         p = e;
+         e = e->next;
+       }
     }
   return ret;
 }
@@ -317,8 +321,8 @@ GNUNET_CONTAINER_multihashmap_remove_all (struct GNUNET_CONTAINER_MultiHashMap
  */
 int
 GNUNET_CONTAINER_multihashmap_contains (const struct
-                                        GNUNET_CONTAINER_MultiHashMap *map,
-                                        const GNUNET_HashCode * key)
+                                       GNUNET_CONTAINER_MultiHashMap *map,
+                                       const GNUNET_HashCode * key)
 {
   struct MapEntry *e;
 
@@ -326,7 +330,38 @@ GNUNET_CONTAINER_multihashmap_contains (const struct
   while (e != NULL)
     {
       if (0 == memcmp (key, &e->key, sizeof (GNUNET_HashCode)))
-        return GNUNET_YES;
+       return GNUNET_YES;
+      e = e->next;
+    }
+  return GNUNET_NO;
+}
+
+
+/**
+ * Check if the map contains the given value under the given
+ * key.
+ *
+ * @param map the map
+ * @param key the key to test if a value exists for it
+ * @param value value to test for
+ * @return GNUNET_YES if such a value exists,
+ *         GNUNET_NO if not
+ */
+int
+GNUNET_CONTAINER_multihashmap_contains_value (const struct
+                                             GNUNET_CONTAINER_MultiHashMap
+                                             *map,
+                                             const GNUNET_HashCode * key,
+                                             const void *value)
+{
+  struct MapEntry *e;
+
+  e = map->map[idx_of (map, key)];
+  while (e != NULL)
+    {
+      if ((0 == memcmp (key, &e->key, sizeof (GNUNET_HashCode))) &&
+         (e->value == value))
+       return GNUNET_YES;
       e = e->next;
     }
   return GNUNET_NO;
@@ -358,12 +393,12 @@ grow (struct GNUNET_CONTAINER_MultiHashMap *map)
   for (i = 0; i < old_len; i++)
     {
       while (NULL != (e = old_map[i]))
-        {
-          old_map[i] = e->next;
-          idx = idx_of (map, &e->key);
-          e->next = new_map[idx];
-          new_map[idx] = e;
-        }
+       {
+         old_map[i] = e->next;
+         idx = idx_of (map, &e->key);
+         e->next = new_map[idx];
+         new_map[idx] = e;
+       }
     }
   GNUNET_free (old_map);
 }
@@ -383,10 +418,9 @@ grow (struct GNUNET_CONTAINER_MultiHashMap *map)
  */
 int
 GNUNET_CONTAINER_multihashmap_put (struct GNUNET_CONTAINER_MultiHashMap *map,
-                                   const GNUNET_HashCode * key,
-                                   void *value,
-                                   enum GNUNET_CONTAINER_MultiHashMapOption
-                                   opt)
+                                  const GNUNET_HashCode * key, void *value,
+                                  enum GNUNET_CONTAINER_MultiHashMapOption
+                                  opt)
 {
   struct MapEntry *e;
   unsigned int i;
@@ -397,16 +431,16 @@ GNUNET_CONTAINER_multihashmap_put (struct GNUNET_CONTAINER_MultiHashMap *map,
     {
       e = map->map[i];
       while (e != NULL)
-        {
-          if (0 == memcmp (key, &e->key, sizeof (GNUNET_HashCode)))
-            {
-              if (opt == GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)
-                return GNUNET_SYSERR;
-              e->value = value;
-              return GNUNET_NO;
-            }
-          e = e->next;
-        }
+       {
+         if (0 == memcmp (key, &e->key, sizeof (GNUNET_HashCode)))
+           {
+             if (opt == GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)
+               return GNUNET_SYSERR;
+             e->value = value;
+             return GNUNET_NO;
+           }
+         e = e->next;
+       }
     }
   if (map->size / 3 >= map->map_length / 4)
     {
@@ -435,10 +469,10 @@ GNUNET_CONTAINER_multihashmap_put (struct GNUNET_CONTAINER_MultiHashMap *map,
  */
 int
 GNUNET_CONTAINER_multihashmap_get_multiple (const struct
-                                            GNUNET_CONTAINER_MultiHashMap
-                                            *map, const GNUNET_HashCode * key,
-                                            GNUNET_CONTAINER_HashMapIterator
-                                            it, void *it_cls)
+                                           GNUNET_CONTAINER_MultiHashMap
+                                           *map, const GNUNET_HashCode * key,
+                                           GNUNET_CONTAINER_HashMapIterator
+                                           it, void *it_cls)
 {
   int count;
   struct MapEntry *e;