[GNUnet-SVN] r13656 - gnunet/src/dht

[gnunet]

Author: nevans
Date: 2010-11-12 11:49:20 +0100 (Fri, 12 Nov 2010)
New Revision: 13656

Modified:
   gnunet/src/dht/gnunet-dht-driver.c
   gnunet/src/dht/gnunet-service-dht.c
   gnunet/src/dht/plugin_dhtlog_mysql_dump_load.c
Log:
coverity fixes

Modified: gnunet/src/dht/gnunet-dht-driver.c
===================================================================
--- gnunet/src/dht/gnunet-dht-driver.c  2010-11-12 10:47:02 UTC (rev 13655)
+++ gnunet/src/dht/gnunet-dht-driver.c  2010-11-12 10:49:20 UTC (rev 13656)
@@ -2050,7 +2050,7 @@
       else /* If we have sent requests, choose peers with a low number of 
connections to send requests from */
         {
           peer_count = 
GNUNET_CONTAINER_heap_remove_root(find_peer_ctx->peer_min_heap);
-          GNUNET_CONTAINER_multihashmap_remove(find_peer_ctx->peer_hash, 
&peer_count->peer_id.hashPubKey, peer_count);
+          GNUNET_assert(GNUNET_YES == 
GNUNET_CONTAINER_multihashmap_remove(find_peer_ctx->peer_hash, 
&peer_count->peer_id.hashPubKey, peer_count));
           test_find_peer->daemon = GNUNET_TESTING_daemon_get_by_id(pg, 
&peer_count->peer_id);
           GNUNET_assert(test_find_peer->daemon != NULL);
         }
@@ -3040,7 +3040,7 @@
                                              &num_peers))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Number of peers must be specified in section %s option 
%s\n", topology_str, "TESTING", "NUM_PEERS");
+                  "Number of peers must be specified in section %s option 
%s\n", "TESTING", "NUM_PEERS");
     }
   GNUNET_assert(num_peers > 0 && num_peers < ULONG_MAX);
   /* Set peers_left so we know when all peers started */

Modified: gnunet/src/dht/gnunet-service-dht.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht.c 2010-11-12 10:47:02 UTC (rev 13655)
+++ gnunet/src/dht/gnunet-service-dht.c 2010-11-12 10:49:20 UTC (rev 13656)
@@ -1535,7 +1535,7 @@
     }
 
   GNUNET_assert(GNUNET_CONTAINER_multihashmap_contains(all_known_peers, 
&peer->id.hashPubKey));
-  GNUNET_CONTAINER_multihashmap_remove (all_known_peers, &peer->id.hashPubKey, 
peer);
+  GNUNET_assert(GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove 
(all_known_peers, &peer->id.hashPubKey, peer));
   GNUNET_free(peer);
 }
 

Modified: gnunet/src/dht/plugin_dhtlog_mysql_dump_load.c
===================================================================
--- gnunet/src/dht/plugin_dhtlog_mysql_dump_load.c      2010-11-12 10:47:02 UTC 
(rev 13655)
+++ gnunet/src/dht/plugin_dhtlog_mysql_dump_load.c      2010-11-12 10:49:20 UTC 
(rev 13656)
@@ -586,7 +586,7 @@
                    outfile_path,
                    "mysqldump_nodes",
                    getpid());
-
+  GNUNET_free(fn);
   fn = GNUNET_STRINGS_filename_expand (outfile_name);
 
   if (fn == NULL)
@@ -619,6 +619,7 @@
                    "mysqldump_routes",
                    getpid());
 
+  GNUNET_free(fn);
   fn = GNUNET_STRINGS_filename_expand (outfile_name);
 
   if (fn == NULL)
@@ -651,6 +652,7 @@
                    "mysqldump_queries",
                    getpid());
 
+  GNUNET_free(fn);
   fn = GNUNET_STRINGS_filename_expand (outfile_name);
 
   if (fn == NULL)
@@ -683,6 +685,7 @@
                    "mysqldump_stats",
                    getpid());
 
+  GNUNET_free(fn);
   fn = GNUNET_STRINGS_filename_expand (outfile_name);
 
   if (fn == NULL)
@@ -714,7 +717,7 @@
                    outfile_path,
                    "mysqldump_generic_stats",
                    getpid());
-
+  GNUNET_free(fn);
   fn = GNUNET_STRINGS_filename_expand (outfile_name);
 
   if (fn == NULL)
@@ -746,7 +749,7 @@
                    outfile_path,
                    "mysqldump_dhtkey",
                    getpid());
-
+  GNUNET_free(fn);
   fn = GNUNET_STRINGS_filename_expand (outfile_name);
 
   if (fn == NULL)
@@ -778,7 +781,7 @@
                    outfile_path,
                    "mysqldump_extended_topology",
                    getpid());
-
+  GNUNET_free(fn);
   fn = GNUNET_STRINGS_filename_expand (outfile_name);
 
   if (fn == NULL)