1 files changed, 33 insertions, 16 deletions

diff --git a/src/messenger/messenger_api_peer_store.c b/src/messenger/messenger_api_peer_store.c
index f0b9eb0bb..949510960 100644
--- a/src/messenger/messenger_api_peer_store.c
+++ b/src/messenger/messenger_api_peer_store.c
@@ -37,25 +37,30 @@ init_peer_store (struct GNUNET_MESSENGER_PeerStore *store)
   store->peers = GNUNET_CONTAINER_multishortmap_create (4, GNUNET_NO);
 }
 
+
 static enum GNUNET_GenericReturnValue
-iterate_destroy_peers (void *cls, const struct GNUNET_ShortHashCode *id, void *value)
+iterate_destroy_peers (void *cls, const struct GNUNET_ShortHashCode *id,
+                       void *value)
 {
-  struct GNUNET_PeerIdentity* peer = value;
+  struct GNUNET_PeerIdentity *peer = value;
   GNUNET_free (peer);
   return GNUNET_YES;
 }
 
+
 void
 clear_peer_store (struct GNUNET_MESSENGER_PeerStore *store)
 {
   GNUNET_assert ((store) && (store->peers));
 
-  GNUNET_CONTAINER_multishortmap_iterate (store->peers, iterate_destroy_peers, NULL);
+  GNUNET_CONTAINER_multishortmap_iterate (store->peers, iterate_destroy_peers,
+                                          NULL);
   GNUNET_CONTAINER_multishortmap_destroy (store->peers);
 
   store->peers = NULL;
 }
 
+
 struct GNUNET_MESSENGER_ClosureVerifyPeer
 {
   const struct GNUNET_MESSENGER_Message *message;
@@ -64,12 +69,14 @@ struct GNUNET_MESSENGER_ClosureVerifyPeer
 };
 
 static enum GNUNET_GenericReturnValue
-verify_store_peer(void *cls, const struct GNUNET_ShortHashCode *id, void *value)
+verify_store_peer (void *cls, const struct GNUNET_ShortHashCode *id,
+                   void *value)
 {
   struct GNUNET_MESSENGER_ClosureVerifyPeer *verify = cls;
-  struct GNUNET_PeerIdentity* peer = value;
+  struct GNUNET_PeerIdentity *peer = value;
 
-  if ((peer) && (GNUNET_OK == verify_message_by_peer (verify->message, verify->hash, peer)))
+  if ((peer) && (GNUNET_OK == verify_message_by_peer (verify->message,
+                                                      verify->hash, peer)))
   {
     verify->sender = peer;
     return GNUNET_NO;
@@ -78,6 +85,7 @@ verify_store_peer(void *cls, const struct GNUNET_ShortHashCode *id, void *value)
   return GNUNET_YES;
 }
 
+
 struct GNUNET_PeerIdentity*
 get_store_peer_of (struct GNUNET_MESSENGER_PeerStore *store,
                    const struct GNUNET_MESSENGER_Message *message,
@@ -89,7 +97,8 @@ get_store_peer_of (struct GNUNET_MESSENGER_PeerStore *store,
     return NULL;
 
   if ((GNUNET_MESSENGER_KIND_PEER == message->header.kind) &&
-      (GNUNET_OK == verify_message_by_peer (message, hash, &(message->body.peer.peer))))
+      (GNUNET_OK == verify_message_by_peer (message, hash,
+                                            &(message->body.peer.peer))))
   {
     struct GNUNET_ShortHashCode peer_id;
     convert_peer_identity_to_id (&(message->body.peer.peer), &peer_id);
@@ -97,7 +106,8 @@ get_store_peer_of (struct GNUNET_MESSENGER_PeerStore *store,
     if (0 == GNUNET_memcmp (&peer_id, &(message->header.sender_id)))
       update_store_peer (store, &(message->body.peer.peer));
     else
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Sender id does not match peer identity\n");
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Sender id does not match peer identity\n");
   }
 
   struct GNUNET_MESSENGER_ClosureVerifyPeer verify;
@@ -105,12 +115,14 @@ get_store_peer_of (struct GNUNET_MESSENGER_PeerStore *store,
   verify.hash = hash;
   verify.sender = NULL;
 
-  GNUNET_CONTAINER_multishortmap_get_multiple (store->peers, &(message->header.sender_id),
+  GNUNET_CONTAINER_multishortmap_get_multiple (store->peers,
+                                               &(message->header.sender_id),
                                                verify_store_peer, &verify);
 
   return verify.sender;
 }
 
+
 struct GNUNET_MESSENGER_ClosureFindPeer
 {
   const struct GNUNET_PeerIdentity *requested;
@@ -118,10 +130,10 @@ struct GNUNET_MESSENGER_ClosureFindPeer
 };
 
 static enum GNUNET_GenericReturnValue
-find_store_peer(void *cls, const struct GNUNET_ShortHashCode *id, void *value)
+find_store_peer (void *cls, const struct GNUNET_ShortHashCode *id, void *value)
 {
   struct GNUNET_MESSENGER_ClosureFindPeer *find = cls;
-  struct GNUNET_PeerIdentity* peer = value;
+  struct GNUNET_PeerIdentity *peer = value;
 
   if ((peer) && (0 == GNUNET_memcmp (find->requested, peer)))
   {
@@ -132,9 +144,10 @@ find_store_peer(void *cls, const struct GNUNET_ShortHashCode *id, void *value)
   return GNUNET_YES;
 }
 
+
 void
 update_store_peer (struct GNUNET_MESSENGER_PeerStore *store,
-                   const struct GNUNET_PeerIdentity* peer)
+                   const struct GNUNET_PeerIdentity *peer)
 {
   GNUNET_assert ((store) && (store->peers) && (peer));
 
@@ -151,11 +164,13 @@ update_store_peer (struct GNUNET_MESSENGER_PeerStore *store,
   if (find.match)
     return;
 
-  struct GNUNET_PeerIdentity* copy = GNUNET_memdup (peer, sizeof (struct GNUNET_PeerIdentity));
+  struct GNUNET_PeerIdentity *copy = GNUNET_memdup (peer, sizeof (struct
+                                                                  GNUNET_PeerIdentity));
   GNUNET_CONTAINER_multishortmap_put (store->peers, &peer_id, copy,
                                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
 }
 
+
 void
 remove_store_peer (struct GNUNET_MESSENGER_PeerStore *store,
                    const struct GNUNET_PeerIdentity *peer)
@@ -172,9 +187,11 @@ remove_store_peer (struct GNUNET_MESSENGER_PeerStore *store,
   GNUNET_CONTAINER_multishortmap_get_multiple (store->peers, &peer_id,
                                                find_store_peer, &find);
 
-  if (!find.match)
+  if (! find.match)
     return;
 
-  if (GNUNET_YES == GNUNET_CONTAINER_multishortmap_remove (store->peers, &peer_id, find.match))
-    GNUNET_free(find.match);
+  if (GNUNET_YES == GNUNET_CONTAINER_multishortmap_remove (store->peers,
+                                                           &peer_id,
+                                                           find.match))
+    GNUNET_free (find.match);
 }