1 files changed, 100 insertions, 101 deletions

diff --git a/src/rps/gnunet-service-rps_view.c b/src/rps/gnunet-service-rps_view.c
index 8a0cae21e..bedd2ae6c 100644
--- a/src/rps/gnunet-service-rps_view.c
+++ b/src/rps/gnunet-service-rps_view.c
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @file rps/gnunet-service-rps_view.c
@@ -28,8 +28,7 @@
 #include "gnunet-service-rps_view.h"
 #include <inttypes.h>
 
-struct View
-{
+struct View {
   /**
    * Array containing the peers
    */
@@ -54,16 +53,16 @@ struct View
  * @return The newly created view
  */
 struct View *
-View_create (uint32_t len)
+View_create(uint32_t len)
 {
   struct View *view;
 
-  view = GNUNET_new (struct View);
+  view = GNUNET_new(struct View);
   view->length = len;
-  view->array = GNUNET_new_array (len, struct GNUNET_PeerIdentity);
+  view->array = GNUNET_new_array(len, struct GNUNET_PeerIdentity);
   view->mpm =
-    GNUNET_CONTAINER_multipeermap_create (len, GNUNET_NO); /* might even be
-                                                            * set to _YES */
+    GNUNET_CONTAINER_multipeermap_create(len, GNUNET_NO);  /* might even be
+                                                           * set to _YES */
   return view;
 }
 
@@ -77,38 +76,38 @@ View_create (uint32_t len)
  * @param len the (maximum) length for the view
  */
 void
-View_change_len (struct View *view,
-                 uint32_t len)
+View_change_len(struct View *view,
+                uint32_t len)
 {
   uint32_t i;
   uint32_t *index;
 
-  if (GNUNET_CONTAINER_multipeermap_size (view->mpm) < len)
-  { /* Simply shrink */
-    /* We might simply clear and free the left over space */
-    GNUNET_array_grow (view->array, view->length, len);
-  }
-  else /* We have to remove elements */
-  {
-    /* TODO find a way to preserve indices */
-    for (i = 0; i < len; i++)
-    {
-      index = GNUNET_CONTAINER_multipeermap_get (view->mpm, &view->array[i]);
-      GNUNET_assert (NULL != index);
-      GNUNET_free (index);
+  if (GNUNET_CONTAINER_multipeermap_size(view->mpm) < len)
+    { /* Simply shrink */
+      /* We might simply clear and free the left over space */
+      GNUNET_array_grow(view->array, view->length, len);
     }
-    GNUNET_array_grow (view->array, view->length, len);
-    GNUNET_CONTAINER_multipeermap_destroy (view->mpm);
-    view->mpm = GNUNET_CONTAINER_multipeermap_create (len, GNUNET_NO);
-    for (i = 0; i < len; i++)
+  else /* We have to remove elements */
     {
-      index = GNUNET_new (uint32_t);
-      *index = i;
-      GNUNET_CONTAINER_multipeermap_put (view->mpm, &view->array[i], index,
-          GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
+      /* TODO find a way to preserve indices */
+      for (i = 0; i < len; i++)
+        {
+          index = GNUNET_CONTAINER_multipeermap_get(view->mpm, &view->array[i]);
+          GNUNET_assert(NULL != index);
+          GNUNET_free(index);
+        }
+      GNUNET_array_grow(view->array, view->length, len);
+      GNUNET_CONTAINER_multipeermap_destroy(view->mpm);
+      view->mpm = GNUNET_CONTAINER_multipeermap_create(len, GNUNET_NO);
+      for (i = 0; i < len; i++)
+        {
+          index = GNUNET_new(uint32_t);
+          *index = i;
+          GNUNET_CONTAINER_multipeermap_put(view->mpm, &view->array[i], index,
+                                            GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
+        }
     }
-  }
-  GNUNET_assert (view->length == len);
+  GNUNET_assert(view->length == len);
 }
 
 
@@ -119,7 +118,7 @@ View_change_len (struct View *view,
  * @return the view in array representation
  */
 const struct GNUNET_PeerIdentity *
-View_get_as_array (const struct View *view)
+View_get_as_array(const struct View *view)
 {
   return view->array;
 }
@@ -132,9 +131,9 @@ View_get_as_array (const struct View *view)
  * @return current number of actually contained peers
  */
 unsigned int
-View_size (const struct View *view)
+View_size(const struct View *view)
 {
-  return GNUNET_CONTAINER_multipeermap_size (view->mpm);
+  return GNUNET_CONTAINER_multipeermap_size(view->mpm);
 }
 
 
@@ -148,25 +147,25 @@ View_size (const struct View *view)
  *         GNUNET_NO if peer was not inserted
  */
 int
-View_put (struct View *view,
-          const struct GNUNET_PeerIdentity *peer)
+View_put(struct View *view,
+         const struct GNUNET_PeerIdentity *peer)
 {
   uint32_t *index;
 
-  if ((view->length <= View_size (view)) || /* If array is 'full' */
-      (GNUNET_YES == View_contains_peer (view, peer)))
-  {
-    return GNUNET_NO;
-  }
+  if ((view->length <= View_size(view)) ||  /* If array is 'full' */
+      (GNUNET_YES == View_contains_peer(view, peer)))
+    {
+      return GNUNET_NO;
+    }
   else
-  {
-    index = GNUNET_new (uint32_t);
-    *index = (uint32_t) View_size (view);
-    view->array[*index] = *peer;
-    GNUNET_CONTAINER_multipeermap_put (view->mpm, peer, index,
-        GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
-    return GNUNET_OK;
-  }
+    {
+      index = GNUNET_new(uint32_t);
+      *index = (uint32_t)View_size(view);
+      view->array[*index] = *peer;
+      GNUNET_CONTAINER_multipeermap_put(view->mpm, peer, index,
+                                        GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
+      return GNUNET_OK;
+    }
 }
 
 
@@ -180,10 +179,10 @@ View_put (struct View *view,
  *         GNUNET_NO otherwise
  */
 int
-View_contains_peer (const struct View *view,
-                    const struct GNUNET_PeerIdentity *peer)
+View_contains_peer(const struct View *view,
+                   const struct GNUNET_PeerIdentity *peer)
 {
-  return GNUNET_CONTAINER_multipeermap_contains (view->mpm, peer);
+  return GNUNET_CONTAINER_multipeermap_contains(view->mpm, peer);
 }
 
 
@@ -197,32 +196,32 @@ View_contains_peer (const struct View *view,
  *         GNUNET_NO if view does not contain peer
  */
 int
-View_remove_peer (struct View *view,
-                  const struct GNUNET_PeerIdentity *peer)
+View_remove_peer(struct View *view,
+                 const struct GNUNET_PeerIdentity *peer)
 {
   uint32_t *index;
   uint32_t *swap_index;
   uint32_t last_index;
 
-  if (GNUNET_NO == View_contains_peer (view, peer))
-  {
-    return GNUNET_NO;
-  }
-  index = GNUNET_CONTAINER_multipeermap_get (view->mpm, peer);
-  GNUNET_assert (NULL != index);
-  last_index = View_size (view) - 1;
+  if (GNUNET_NO == View_contains_peer(view, peer))
+    {
+      return GNUNET_NO;
+    }
+  index = GNUNET_CONTAINER_multipeermap_get(view->mpm, peer);
+  GNUNET_assert(NULL != index);
+  last_index = View_size(view) - 1;
   if (*index < last_index)
-  { /* Fill the 'gap' in the array with the last peer */
-    view->array[*index] = view->array[last_index];
-    GNUNET_assert (GNUNET_YES == View_contains_peer (view,
+    { /* Fill the 'gap' in the array with the last peer */
+      view->array[*index] = view->array[last_index];
+      GNUNET_assert(GNUNET_YES == View_contains_peer(view,
                                                      &view->array[last_index]));
-    swap_index = GNUNET_CONTAINER_multipeermap_get (view->mpm,
-                                                    &view->array[last_index]);
-    GNUNET_assert (NULL != swap_index);
-    *swap_index = *index;
-    GNUNET_free (index);
-  }
-  GNUNET_CONTAINER_multipeermap_remove_all (view->mpm, peer);
+      swap_index = GNUNET_CONTAINER_multipeermap_get(view->mpm,
+                                                     &view->array[last_index]);
+      GNUNET_assert(NULL != swap_index);
+      *swap_index = *index;
+      GNUNET_free(index);
+    }
+  GNUNET_CONTAINER_multipeermap_remove_all(view->mpm, peer);
   return GNUNET_OK;
 }
 
@@ -237,17 +236,17 @@ View_remove_peer (struct View *view,
  *         NULL if this index is not known
  */
 const struct GNUNET_PeerIdentity *
-View_get_peer_by_index (const struct View *view,
-                        uint32_t index)
+View_get_peer_by_index(const struct View *view,
+                       uint32_t index)
 {
-  if (index < GNUNET_CONTAINER_multipeermap_size (view->mpm))
-  {
-    return &view->array[index];
-  }
+  if (index < GNUNET_CONTAINER_multipeermap_size(view->mpm))
+    {
+      return &view->array[index];
+    }
   else
-  {
-    return NULL;
-  }
+    {
+      return NULL;
+    }
 }
 
 
@@ -257,20 +256,20 @@ View_get_peer_by_index (const struct View *view,
  * @param view The view to clear
  */
 void
-View_clear (struct View *view)
+View_clear(struct View *view)
 {
-  for (uint32_t i = 0; 0 < View_size (view); i++)
-  { /* Need to free indices stored at peers */
-    uint32_t *index;
-
-    GNUNET_assert (GNUNET_YES ==
-        GNUNET_CONTAINER_multipeermap_contains (view->mpm, &view->array[i]));
-    index = GNUNET_CONTAINER_multipeermap_get (view->mpm, &view->array[i]);
-    GNUNET_assert (NULL != index);
-    GNUNET_free (index);
-    GNUNET_CONTAINER_multipeermap_remove_all (view->mpm, &view->array[i]);
-  }
-  GNUNET_assert (0 == View_size (view));
+  for (uint32_t i = 0; 0 < View_size(view); i++)
+    { /* Need to free indices stored at peers */
+      uint32_t *index;
+
+      GNUNET_assert(GNUNET_YES ==
+                    GNUNET_CONTAINER_multipeermap_contains(view->mpm, &view->array[i]));
+      index = GNUNET_CONTAINER_multipeermap_get(view->mpm, &view->array[i]);
+      GNUNET_assert(NULL != index);
+      GNUNET_free(index);
+      GNUNET_CONTAINER_multipeermap_remove_all(view->mpm, &view->array[i]);
+    }
+  GNUNET_assert(0 == View_size(view));
 }
 
 
@@ -280,13 +279,13 @@ View_clear (struct View *view)
  * @param view the view to destroy
  */
 void
-View_destroy (struct View *view)
+View_destroy(struct View *view)
 {
-  View_clear (view);
-  GNUNET_free (view->array);
+  View_clear(view);
+  GNUNET_free(view->array);
   view->array = NULL;
-  GNUNET_CONTAINER_multipeermap_destroy (view->mpm);
-  GNUNET_free (view);
+  GNUNET_CONTAINER_multipeermap_destroy(view->mpm);
+  GNUNET_free(view);
 }
 
 /* end of gnunet-service-rps_view.c */