[GNUnet-SVN] r30727 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2013-11-15 15:15:18 +0100 (Fri, 15 Nov 2013)
New Revision: 30727

Modified:
   gnunet/src/mesh/gnunet-service-mesh_connection.c
   gnunet/src/mesh/gnunet-service-mesh_dht.c
   gnunet/src/mesh/gnunet-service-mesh_local.c
Log:
- show WARNING if elements were not in the hashmaps


Modified: gnunet/src/mesh/gnunet-service-mesh_connection.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_connection.c    2013-11-15 13:20:35 UTC 
(rev 30726)
+++ gnunet/src/mesh/gnunet-service-mesh_connection.c    2013-11-15 14:15:18 UTC 
(rev 30727)
@@ -2146,7 +2146,8 @@
   if (GNUNET_NO == GMC_is_origin (c, GNUNET_YES))
     path_destroy (c->path);
 
-  (void) GNUNET_CONTAINER_multihashmap_remove (connections, &c->id, c);
+  GNUNET_break (GNUNET_YES ==
+                GNUNET_CONTAINER_multihashmap_remove (connections, &c->id, c));
 
   GNUNET_free (c);
 }

Modified: gnunet/src/mesh/gnunet-service-mesh_dht.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_dht.c   2013-11-15 13:20:35 UTC (rev 
30726)
+++ gnunet/src/mesh/gnunet-service-mesh_dht.c   2013-11-15 14:15:18 UTC (rev 
30727)
@@ -384,7 +384,9 @@
 void
 GMD_search_stop (struct GMD_search_handle *h)
 {
-  (void) GNUNET_CONTAINER_multihashmap32_remove (get_requests, h->peer_id, h);
+  GNUNET_break (GNUNET_OK ==
+                GNUNET_CONTAINER_multihashmap32_remove (get_requests,
+                                                        h->peer_id, h));
   GNUNET_DHT_get_stop (h->dhtget);
   GNUNET_free (h);
 }
\ No newline at end of file

Modified: gnunet/src/mesh/gnunet-service-mesh_local.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_local.c 2013-11-15 13:20:35 UTC (rev 
30726)
+++ gnunet/src/mesh/gnunet-service-mesh_local.c 2013-11-15 14:15:18 UTC (rev 
30727)
@@ -813,7 +813,7 @@
 
 
 /**
- * Remove a channel from a client
+ * Remove a channel from a client.
  *
  * @param client Client.
  * @param chid Channel ID.
@@ -825,11 +825,13 @@
                     struct MeshChannel *ch)
 {
   if (GNUNET_MESH_LOCAL_CHANNEL_ID_SERV <= chid)
-    (void) GNUNET_CONTAINER_multihashmap32_remove (client->incoming_channels,
-                                                   chid, ch);
+    GNUNET_break (GNUNET_YES ==
+                  GNUNET_CONTAINER_multihashmap32_remove 
(client->incoming_channels,
+                                                          chid, ch));
   else if (GNUNET_MESH_LOCAL_CHANNEL_ID_CLI <= chid)
-    (void) GNUNET_CONTAINER_multihashmap32_remove (client->own_channels,
-                                                   chid, ch);
+    GNUNET_break (GNUNET_YES ==
+                  GNUNET_CONTAINER_multihashmap32_remove (client->own_channels,
+                                                          chid, ch));
   else
     GNUNET_break (0);
 }