From 21494e96807553b81140769c7c69949b82592e96 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Julius=20B=C3=BCnger?= Date: Thu, 21 Feb 2019 22:05:44 +0100 Subject: [PATCH] RPS: Adapt to coding style (cosmetic only) --- src/rps/gnunet-service-rps_custommap.c | 39 ++++++++++++++++++-------- 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/src/rps/gnunet-service-rps_custommap.c b/src/rps/gnunet-service-rps_custommap.c index 18a433d6b..d3cc8d104 100644 --- a/src/rps/gnunet-service-rps_custommap.c +++ b/src/rps/gnunet-service-rps_custommap.c @@ -82,7 +82,8 @@ CustomPeerMap_create (unsigned int len) 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->peer_map = GNUNET_CONTAINER_multipeermap_create (len, + GNUNET_NO); return c_peer_map; } @@ -129,10 +130,16 @@ CustomPeerMap_put (const struct CustomPeerMap *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_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_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)); @@ -194,30 +201,38 @@ CustomPeerMap_remove_peer (const struct CustomPeerMap *c_peer_map, uint32_t *last_index; struct GNUNET_PeerIdentity *last_p; - if (GNUNET_NO == CustomPeerMap_contains_peer (c_peer_map, peer)) + if (GNUNET_NO == CustomPeerMap_contains_peer (c_peer_map, + peer)) { return GNUNET_NO; } - index = CustomPeerMap_get_index_pointer (c_peer_map, peer); + 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); + 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); + 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); + 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); + 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_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); + GNUNET_CONTAINER_multihashmap32_remove_all (c_peer_map->hash_map, + *last_index); *last_index = *index; } GNUNET_free (index); -- 2.25.1