From: Christian Grothoff <christian@grothoff.org>
Date: Sat, 16 Jul 2011 20:17:34 +0000 (+0000)
Subject: assert
X-Git-Tag: initial-import-from-subversion-38251~17798
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=95f059ea4b268b48aed6182056a256228bd81dd2;p=oweals%2Fgnunet.git

assert
---

diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
index 7a444847c..eebb39581 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 e45585db6..b62c20005 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));