1 files changed, 129 insertions, 124 deletions

diff --git a/src/rps/gnunet-service-rps_custommap.c b/src/rps/gnunet-service-rps_custommap.c
index b842bc0a5..8fcfc5558 100644
--- a/src/rps/gnunet-service-rps_custommap.c
+++ b/src/rps/gnunet-service-rps_custommap.c
@@ -28,7 +28,7 @@
 #include "gnunet-service-rps_custommap.h"
 #include <inttypes.h>
 
-#define LOG(kind, ...) GNUNET_log_from(kind, "rps-peers", __VA_ARGS__)
+#define LOG(kind, ...) GNUNET_log_from (kind, "rps-peers", __VA_ARGS__)
 
 
 /**
@@ -54,7 +54,8 @@
  * - contain continous indices 0 <= i < len
  * - not contain duplicate peers
  */
-struct CustomPeerMap {
+struct CustomPeerMap
+{
   /**
    * Multihashmap to be able to access a random index
    */
@@ -75,14 +76,14 @@ struct CustomPeerMap {
  * @return the newly created custom peer map
  */
 struct CustomPeerMap *
-CustomPeerMap_create(unsigned int len)
+CustomPeerMap_create (unsigned int len)
 {
   struct CustomPeerMap *c_peer_map;
 
-  c_peer_map = GNUNET_new(struct CustomPeerMap);
-  c_peer_map->hash_map = GNUNET_CONTAINER_multihashmap32_create(len);
-  c_peer_map->peer_map = GNUNET_CONTAINER_multipeermap_create(len,
-                                                              GNUNET_NO);
+  c_peer_map = GNUNET_new (struct CustomPeerMap);
+  c_peer_map->hash_map = GNUNET_CONTAINER_multihashmap32_create (len);
+  c_peer_map->peer_map = GNUNET_CONTAINER_multipeermap_create (len,
+                                                               GNUNET_NO);
   return c_peer_map;
 }
 
@@ -94,11 +95,11 @@ CustomPeerMap_create(unsigned int len)
  * @return size of the map
  */
 unsigned int
-CustomPeerMap_size(const struct CustomPeerMap *c_peer_map)
+CustomPeerMap_size (const struct CustomPeerMap *c_peer_map)
 {
-  GNUNET_assert(GNUNET_CONTAINER_multihashmap32_size(c_peer_map->hash_map) ==
-                GNUNET_CONTAINER_multipeermap_size(c_peer_map->peer_map));
-  return GNUNET_CONTAINER_multipeermap_size(c_peer_map->peer_map);
+  GNUNET_assert (GNUNET_CONTAINER_multihashmap32_size (c_peer_map->hash_map) ==
+                 GNUNET_CONTAINER_multipeermap_size (c_peer_map->peer_map));
+  return GNUNET_CONTAINER_multipeermap_size (c_peer_map->peer_map);
 }
 
 /**
@@ -111,39 +112,40 @@ CustomPeerMap_size(const struct CustomPeerMap *c_peer_map)
  *         GNUNET_NO if map did contain peer previously
  */
 int
-CustomPeerMap_put(const struct CustomPeerMap *c_peer_map,
-                  const struct GNUNET_PeerIdentity *peer)
+CustomPeerMap_put (const struct CustomPeerMap *c_peer_map,
+                   const struct GNUNET_PeerIdentity *peer)
 {
   uint32_t *index;
   struct GNUNET_PeerIdentity *p;
 
-  GNUNET_assert(GNUNET_CONTAINER_multihashmap32_size(c_peer_map->hash_map) ==
-                GNUNET_CONTAINER_multipeermap_size(c_peer_map->peer_map));
-  if (GNUNET_NO == GNUNET_CONTAINER_multipeermap_contains(c_peer_map->peer_map,
-                                                          peer))
-    {
-      /* Need to store the index of the peer in the peermap to be able to remove
-       * it properly */
-      index = GNUNET_new(uint32_t);
-      *index = CustomPeerMap_size(c_peer_map);
-      p = GNUNET_new(struct GNUNET_PeerIdentity);
-      *p = *peer;
-      GNUNET_assert(p != peer);
-      GNUNET_assert(0 == memcmp(p,
+  GNUNET_assert (GNUNET_CONTAINER_multihashmap32_size (c_peer_map->hash_map) ==
+                 GNUNET_CONTAINER_multipeermap_size (c_peer_map->peer_map));
+  if (GNUNET_NO == GNUNET_CONTAINER_multipeermap_contains (c_peer_map->peer_map,
+                                                           peer))
+  {
+    /* Need to store the index of the peer in the peermap to be able to remove
+     * it properly */
+    index = GNUNET_new (uint32_t);
+    *index = CustomPeerMap_size (c_peer_map);
+    p = GNUNET_new (struct GNUNET_PeerIdentity);
+    *p = *peer;
+    GNUNET_assert (p != peer);
+    GNUNET_assert (0 == memcmp (p,
                                 peer,
                                 sizeof(struct GNUNET_PeerIdentity)));
-      GNUNET_CONTAINER_multipeermap_put(c_peer_map->peer_map,
-                                        p,
-                                        index,
-                                        GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
-      GNUNET_CONTAINER_multihashmap32_put(c_peer_map->hash_map,
-                                          *index,
-                                          p,
-                                          GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
-      GNUNET_assert(GNUNET_CONTAINER_multihashmap32_size(c_peer_map->hash_map) ==
-                    GNUNET_CONTAINER_multipeermap_size(c_peer_map->peer_map));
-      return GNUNET_OK;
-    }
+    GNUNET_CONTAINER_multipeermap_put (c_peer_map->peer_map,
+                                       p,
+                                       index,
+                                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
+    GNUNET_CONTAINER_multihashmap32_put (c_peer_map->hash_map,
+                                         *index,
+                                         p,
+                                         GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
+    GNUNET_assert (GNUNET_CONTAINER_multihashmap32_size (
+                     c_peer_map->hash_map) ==
+                   GNUNET_CONTAINER_multipeermap_size (c_peer_map->peer_map));
+    return GNUNET_OK;
+  }
   return GNUNET_NO;
 }
 
@@ -157,10 +159,10 @@ CustomPeerMap_put(const struct CustomPeerMap *c_peer_map,
  *         GNUNET_NO  otherwise
  */
 int
-CustomPeerMap_contains_peer(const struct CustomPeerMap *c_peer_map,
-                            const struct GNUNET_PeerIdentity *peer)
+CustomPeerMap_contains_peer (const struct CustomPeerMap *c_peer_map,
+                             const struct GNUNET_PeerIdentity *peer)
 {
-  return GNUNET_CONTAINER_multipeermap_contains(c_peer_map->peer_map, peer);
+  return GNUNET_CONTAINER_multipeermap_contains (c_peer_map->peer_map, peer);
 }
 
 /**
@@ -172,13 +174,13 @@ CustomPeerMap_contains_peer(const struct CustomPeerMap *c_peer_map,
  * @return the index
  */
 static uint32_t *
-CustomPeerMap_get_index_pointer(const struct CustomPeerMap *c_peer_map,
-                                const struct GNUNET_PeerIdentity *peer)
+CustomPeerMap_get_index_pointer (const struct CustomPeerMap *c_peer_map,
+                                 const struct GNUNET_PeerIdentity *peer)
 {
   uint32_t *index;
 
-  GNUNET_assert(GNUNET_YES == CustomPeerMap_contains_peer(c_peer_map, peer));
-  index = GNUNET_CONTAINER_multipeermap_get(c_peer_map->peer_map, peer);
+  GNUNET_assert (GNUNET_YES == CustomPeerMap_contains_peer (c_peer_map, peer));
+  index = GNUNET_CONTAINER_multipeermap_get (c_peer_map->peer_map, peer);
   return index;
 }
 
@@ -192,52 +194,52 @@ CustomPeerMap_get_index_pointer(const struct CustomPeerMap *c_peer_map,
  *         GNUNET_NO if map does not contain peer
  */
 int
-CustomPeerMap_remove_peer(const struct CustomPeerMap *c_peer_map,
-                          const struct GNUNET_PeerIdentity *peer)
+CustomPeerMap_remove_peer (const struct CustomPeerMap *c_peer_map,
+                           const struct GNUNET_PeerIdentity *peer)
 {
   uint32_t *index;
   struct GNUNET_PeerIdentity *p;
   uint32_t *last_index;
   struct GNUNET_PeerIdentity *last_p;
 
-  if (GNUNET_NO == CustomPeerMap_contains_peer(c_peer_map,
-                                               peer))
-    {
-      return GNUNET_NO;
-    }
-  index = CustomPeerMap_get_index_pointer(c_peer_map,
-                                          peer);
-  GNUNET_assert(*index < CustomPeerMap_size(c_peer_map));
+  if (GNUNET_NO == CustomPeerMap_contains_peer (c_peer_map,
+                                                peer))
+  {
+    return GNUNET_NO;
+  }
+  index = CustomPeerMap_get_index_pointer (c_peer_map,
+                                           peer);
+  GNUNET_assert (*index < CustomPeerMap_size (c_peer_map));
   /* Need to get the pointer stored in the hashmap to free it */
-  p = GNUNET_CONTAINER_multihashmap32_get(c_peer_map->hash_map,
-                                          *index);
-  GNUNET_assert(NULL != p);
-  GNUNET_CONTAINER_multihashmap32_remove_all(c_peer_map->hash_map,
-                                             *index);
+  p = GNUNET_CONTAINER_multihashmap32_get (c_peer_map->hash_map,
+                                           *index);
+  GNUNET_assert (NULL != p);
+  GNUNET_CONTAINER_multihashmap32_remove_all (c_peer_map->hash_map,
+                                              *index);
   // TODO wrong peerid?
-  GNUNET_CONTAINER_multipeermap_remove_all(c_peer_map->peer_map,
-                                           peer);
-  if (*index != CustomPeerMap_size(c_peer_map))
-    { /* fill 'gap' with peer at last index */
-      last_p =
-        GNUNET_CONTAINER_multihashmap32_get(c_peer_map->hash_map,
-                                            CustomPeerMap_size(c_peer_map));
-      GNUNET_assert(NULL != last_p);
-      last_index = GNUNET_CONTAINER_multipeermap_get(c_peer_map->peer_map,
-                                                     last_p);
-      GNUNET_assert(NULL != last_index);
-      GNUNET_assert(CustomPeerMap_size(c_peer_map) == *last_index);
-      GNUNET_CONTAINER_multihashmap32_put(c_peer_map->hash_map,
-                                          *index, last_p,
-                                          GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
-      GNUNET_CONTAINER_multihashmap32_remove_all(c_peer_map->hash_map,
-                                                 *last_index);
-      *last_index = *index;
-    }
-  GNUNET_free(index);
-  GNUNET_assert(GNUNET_CONTAINER_multihashmap32_size(c_peer_map->hash_map) ==
-                GNUNET_CONTAINER_multipeermap_size(c_peer_map->peer_map));
-  GNUNET_free(p);
+  GNUNET_CONTAINER_multipeermap_remove_all (c_peer_map->peer_map,
+                                            peer);
+  if (*index != CustomPeerMap_size (c_peer_map))
+  {   /* fill 'gap' with peer at last index */
+    last_p =
+      GNUNET_CONTAINER_multihashmap32_get (c_peer_map->hash_map,
+                                           CustomPeerMap_size (c_peer_map));
+    GNUNET_assert (NULL != last_p);
+    last_index = GNUNET_CONTAINER_multipeermap_get (c_peer_map->peer_map,
+                                                    last_p);
+    GNUNET_assert (NULL != last_index);
+    GNUNET_assert (CustomPeerMap_size (c_peer_map) == *last_index);
+    GNUNET_CONTAINER_multihashmap32_put (c_peer_map->hash_map,
+                                         *index, last_p,
+                                         GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+    GNUNET_CONTAINER_multihashmap32_remove_all (c_peer_map->hash_map,
+                                                *last_index);
+    *last_index = *index;
+  }
+  GNUNET_free (index);
+  GNUNET_assert (GNUNET_CONTAINER_multihashmap32_size (c_peer_map->hash_map) ==
+                 GNUNET_CONTAINER_multipeermap_size (c_peer_map->peer_map));
+  GNUNET_free (p);
   return GNUNET_OK;
 }
 
@@ -251,14 +253,14 @@ CustomPeerMap_remove_peer(const struct CustomPeerMap *c_peer_map,
  *         if this index is not known, return NULL
  */
 struct GNUNET_PeerIdentity *
-CustomPeerMap_get_peer_by_index(const struct CustomPeerMap *c_peer_map,
-                                uint32_t index)
+CustomPeerMap_get_peer_by_index (const struct CustomPeerMap *c_peer_map,
+                                 uint32_t index)
 {
   if (GNUNET_YES ==
-      GNUNET_CONTAINER_multihashmap32_contains(c_peer_map->hash_map, index))
-    {
-      return GNUNET_CONTAINER_multihashmap32_get(c_peer_map->hash_map, index);
-    }
+      GNUNET_CONTAINER_multihashmap32_contains (c_peer_map->hash_map, index))
+  {
+    return GNUNET_CONTAINER_multihashmap32_get (c_peer_map->hash_map, index);
+  }
   return NULL;
 }
 
@@ -272,30 +274,30 @@ CustomPeerMap_get_peer_by_index(const struct CustomPeerMap *c_peer_map,
  *         GNUNET_NO if map does not contain (index of) peer
  */
 int
-CustomPeerMap_remove_peer_by_index(const struct CustomPeerMap *c_peer_map,
-                                   uint32_t index)
+CustomPeerMap_remove_peer_by_index (const struct CustomPeerMap *c_peer_map,
+                                    uint32_t index)
 {
   uint32_t *index_p;
   struct GNUNET_PeerIdentity *peer;
 
-  if (index >= CustomPeerMap_size(c_peer_map))
-    {
-      return GNUNET_NO;
-    }
-  GNUNET_assert(GNUNET_CONTAINER_multihashmap32_size(c_peer_map->hash_map) ==
-                GNUNET_CONTAINER_multipeermap_size(c_peer_map->peer_map));
+  if (index >= CustomPeerMap_size (c_peer_map))
+  {
+    return GNUNET_NO;
+  }
+  GNUNET_assert (GNUNET_CONTAINER_multihashmap32_size (c_peer_map->hash_map) ==
+                 GNUNET_CONTAINER_multipeermap_size (c_peer_map->peer_map));
   if (GNUNET_NO ==
-      GNUNET_CONTAINER_multihashmap32_contains(c_peer_map->hash_map, index))
-    {
-      return GNUNET_NO;
-    }
-  peer = CustomPeerMap_get_peer_by_index(c_peer_map, index);
-  GNUNET_assert(NULL != peer);
-  index_p = CustomPeerMap_get_index_pointer(c_peer_map, peer);
-  GNUNET_assert(index == *index_p);
-  CustomPeerMap_remove_peer(c_peer_map, peer);
-  GNUNET_assert(GNUNET_CONTAINER_multihashmap32_size(c_peer_map->hash_map) ==
-                GNUNET_CONTAINER_multipeermap_size(c_peer_map->peer_map));
+      GNUNET_CONTAINER_multihashmap32_contains (c_peer_map->hash_map, index))
+  {
+    return GNUNET_NO;
+  }
+  peer = CustomPeerMap_get_peer_by_index (c_peer_map, index);
+  GNUNET_assert (NULL != peer);
+  index_p = CustomPeerMap_get_index_pointer (c_peer_map, peer);
+  GNUNET_assert (index == *index_p);
+  CustomPeerMap_remove_peer (c_peer_map, peer);
+  GNUNET_assert (GNUNET_CONTAINER_multihashmap32_size (c_peer_map->hash_map) ==
+                 GNUNET_CONTAINER_multipeermap_size (c_peer_map->peer_map));
   return GNUNET_OK;
 }
 
@@ -307,18 +309,21 @@ CustomPeerMap_remove_peer_by_index(const struct CustomPeerMap *c_peer_map,
  * @return size of the map
  */
 void
-CustomPeerMap_clear(const struct CustomPeerMap *c_peer_map)
+CustomPeerMap_clear (const struct CustomPeerMap *c_peer_map)
 {
-  while (0 < CustomPeerMap_size(c_peer_map))
-    {
-      GNUNET_assert(GNUNET_YES ==
-                    GNUNET_CONTAINER_multihashmap32_contains(c_peer_map->hash_map,
-                                                             CustomPeerMap_size(c_peer_map) - 1));
-      GNUNET_assert(GNUNET_OK ==
-                    CustomPeerMap_remove_peer_by_index(c_peer_map,
-                                                       CustomPeerMap_size(c_peer_map) - 1));
-    }
-  GNUNET_assert(0 == CustomPeerMap_size(c_peer_map));
+  while (0 < CustomPeerMap_size (c_peer_map))
+  {
+    GNUNET_assert (GNUNET_YES ==
+                   GNUNET_CONTAINER_multihashmap32_contains (
+                     c_peer_map->hash_map,
+                     CustomPeerMap_size (
+                       c_peer_map) - 1));
+    GNUNET_assert (GNUNET_OK ==
+                   CustomPeerMap_remove_peer_by_index (c_peer_map,
+                                                       CustomPeerMap_size (
+                                                         c_peer_map) - 1));
+  }
+  GNUNET_assert (0 == CustomPeerMap_size (c_peer_map));
 }
 
 /**
@@ -327,12 +332,12 @@ CustomPeerMap_clear(const struct CustomPeerMap *c_peer_map)
  * @param c_peer_map the map to destroy
  */
 void
-CustomPeerMap_destroy(struct CustomPeerMap *c_peer_map)
+CustomPeerMap_destroy (struct CustomPeerMap *c_peer_map)
 {
-  CustomPeerMap_clear(c_peer_map);
-  GNUNET_CONTAINER_multihashmap32_destroy(c_peer_map->hash_map);
-  GNUNET_CONTAINER_multipeermap_destroy(c_peer_map->peer_map);
-  GNUNET_free(c_peer_map);
+  CustomPeerMap_clear (c_peer_map);
+  GNUNET_CONTAINER_multihashmap32_destroy (c_peer_map->hash_map);
+  GNUNET_CONTAINER_multipeermap_destroy (c_peer_map->peer_map);
+  GNUNET_free (c_peer_map);
 }
 
 /* end of gnunet-service-rps_custommap.c */