aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-07-16 20:17:34 +0000
committerChristian Grothoff <christian@grothoff.org>2011-07-16 20:17:34 +0000
commit95f059ea4b268b48aed6182056a256228bd81dd2 (patch)
treefd27438c2f037831f905509c576bd32979dabb36 /src
parente7b6929291bc646bd82602705b3690baf9251c77 (diff)
assert
Diffstat (limited to 'src')
-rw-r--r--src/core/gnunet-service-core.c16
-rw-r--r--src/fs/gnunet-service-fs_pe.c2
2 files changed, 10 insertions, 8 deletions
diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
index 7a444847c9..eebb39581a 100644
--- a/src/core/gnunet-service-core.c
+++ b/src/core/gnunet-service-core.c
@@ -1721,9 +1721,10 @@ free_neighbour (struct Neighbour *n)
GNUNET_CONTAINER_DLL_remove (n->active_client_request_head,
n->active_client_request_tail,
car);
- GNUNET_CONTAINER_multihashmap_remove (car->client->requests,
- &n->peer.hashPubKey,
- car);
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove (car->client->requests,
+ &n->peer.hashPubKey,
+ car));
GNUNET_free (car);
}
if (NULL != n->th)
@@ -1924,7 +1925,7 @@ consider_free_neighbour (struct Neighbour *n)
return;
}
/* actually free the neighbour... */
- GNUNET_assert (GNUNET_OK ==
+ GNUNET_assert (GNUNET_YES ==
GNUNET_CONTAINER_multihashmap_remove (neighbours,
&n->peer.hashPubKey,
n));
@@ -4560,9 +4561,10 @@ handle_transport_notify_disconnect (void *cls,
GNUNET_CONTAINER_DLL_remove (n->active_client_request_head,
n->active_client_request_tail,
car);
- GNUNET_CONTAINER_multihashmap_remove (car->client->requests,
- &n->peer.hashPubKey,
- car);
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove (car->client->requests,
+ &n->peer.hashPubKey,
+ car));
GNUNET_free (car);
}
diff --git a/src/fs/gnunet-service-fs_pe.c b/src/fs/gnunet-service-fs_pe.c
index e45585db6a..b62c200052 100644
--- a/src/fs/gnunet-service-fs_pe.c
+++ b/src/fs/gnunet-service-fs_pe.c
@@ -389,7 +389,7 @@ GSF_plan_notify_peer_disconnect_ (const struct GSF_ConnectedPeer *cp)
&id.hashPubKey);
if (NULL == pp)
return; /* nothing was ever planned for this peer */
- GNUNET_assert (GNUNET_OK ==
+ GNUNET_assert (GNUNET_YES ==
GNUNET_CONTAINER_multihashmap_remove (plans,
&id.hashPubKey,
pp));