diff options
| author | Christian Grothoff <christian@grothoff.org> | 2018-08-14 11:17:30 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2018-08-14 11:17:30 +0200 |
| commit | 5bb2565bab0b8fa8cac263b9fb70edf3ae2278d9 (patch) | |
| tree | 33d2a86abe831bfd3cd711ad7332433b35891766 /src/rps/gnunet-service-rps_custommap.c | |
| parent | 97e72521285a2ff2189334cb43d0a8f385d73e4a (diff) | |
| parent | 4cc09ba10da89ac32b4a40bde9abbe77bba21c78 (diff) | |
| download | gnunet-5bb2565bab0b8fa8cac263b9fb70edf3ae2278d9.tar.gz gnunet-5bb2565bab0b8fa8cac263b9fb70edf3ae2278d9.zip | |
resolve merge conflict with peerinfo plugin move
Diffstat (limited to 'src/rps/gnunet-service-rps_custommap.c')
| -rw-r--r-- | src/rps/gnunet-service-rps_custommap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/rps/gnunet-service-rps_custommap.c b/src/rps/gnunet-service-rps_custommap.c index 9e003eb39..3513ff8da 100644 --- a/src/rps/gnunet-service-rps_custommap.c +++ b/src/rps/gnunet-service-rps_custommap.c | |||
| @@ -202,6 +202,7 @@ CustomPeerMap_remove_peer (const struct CustomPeerMap *c_peer_map, | |||
| 202 | p = GNUNET_CONTAINER_multihashmap32_get (c_peer_map->hash_map, *index); | 202 | p = GNUNET_CONTAINER_multihashmap32_get (c_peer_map->hash_map, *index); |
| 203 | GNUNET_assert (NULL != p); | 203 | GNUNET_assert (NULL != p); |
| 204 | GNUNET_CONTAINER_multihashmap32_remove_all (c_peer_map->hash_map, *index); | 204 | GNUNET_CONTAINER_multihashmap32_remove_all (c_peer_map->hash_map, *index); |
| 205 | // TODO wrong peerid? | ||
| 205 | GNUNET_CONTAINER_multipeermap_remove_all (c_peer_map->peer_map, peer); | 206 | GNUNET_CONTAINER_multipeermap_remove_all (c_peer_map->peer_map, peer); |
| 206 | if (*index != CustomPeerMap_size (c_peer_map)) | 207 | if (*index != CustomPeerMap_size (c_peer_map)) |
| 207 | { /* fill 'gap' with peer at last index */ | 208 | { /* fill 'gap' with peer at last index */ |