[GNUnet-SVN] r16039 - in gnunet/src: core fs

[gnunet]

Author: grothoff
Date: 2011-07-16 22:17:34 +0200 (Sat, 16 Jul 2011)
New Revision: 16039

Modified:
   gnunet/src/core/gnunet-service-core.c
   gnunet/src/fs/gnunet-service-fs_pe.c
Log:
assert

Modified: gnunet/src/core/gnunet-service-core.c
===================================================================
--- gnunet/src/core/gnunet-service-core.c       2011-07-16 20:15:38 UTC (rev 
16038)
+++ gnunet/src/core/gnunet-service-core.c       2011-07-16 20:17:34 UTC (rev 
16039)
@@ -1721,9 +1721,10 @@
       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 @@
       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 @@
       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);
     }
 

Modified: gnunet/src/fs/gnunet-service-fs_pe.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_pe.c        2011-07-16 20:15:38 UTC (rev 
16038)
+++ gnunet/src/fs/gnunet-service-fs_pe.c        2011-07-16 20:17:34 UTC (rev 
16039)
@@ -389,7 +389,7 @@
                                          &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));