3 files changed, 16 insertions, 12 deletions

diff --git a/src/transport/gnunet-communicator-tcp.c b/src/transport/gnunet-communicator-tcp.c
index 7d4360bb0..db2aea552 100644
--- a/src/transport/gnunet-communicator-tcp.c
+++ b/src/transport/gnunet-communicator-tcp.c
@@ -1643,9 +1643,9 @@ pending_reversals_delete_it (void *cls,
     GNUNET_SCHEDULER_cancel (pending_reversal->timeout_task);
     pending_reversal->timeout_task = NULL;
   }
-  GNUNET_CONTAINER_multihashmap_remove (pending_reversals,
-                                        key,
-                                        pending_reversal);
+  GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove (pending_reversals,
+                                                         key,
+                                                         pending_reversal));
   GNUNET_free (pending_reversal->in);
   GNUNET_free (pending_reversal);
   return GNUNET_OK;
@@ -1675,7 +1675,7 @@ check_and_remove_pending_reversal (struct sockaddr *in, sa_family_t sa_family, s
             GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                         "Removing invalid pending reversal for `%s'at `%s'\n",
                         GNUNET_i2s (&pending_reversal->target),
-                        GNUNET_a2s (in, sizeof (in)));
+                        GNUNET_a2s (in, sizeof (struct sockaddr)));
                         pending_reversals_delete_it (NULL, &key, pending_reversal);
         }
         GNUNET_free (natted_address);
@@ -3071,6 +3071,7 @@ create_proto_queue (struct GNUNET_NETWORK_Handle *sock,
                     in->sa_family,
                     strerror (errno));
         GNUNET_free (in);
+        GNUNET_free (pq);
         return NULL;
       }
     if ((GNUNET_OK != GNUNET_NETWORK_socket_connect (sock, in, addrlen)) &&
@@ -3201,9 +3202,12 @@ pending_reversal_timeout (void *cls)
 
   GNUNET_assert (NULL != pending_reversal);
 
-  GNUNET_CONTAINER_multihashmap_remove (pending_reversals,
-                                        &key,
-                                        pending_reversal);
+  if (GNUNET_NO == GNUNET_CONTAINER_multihashmap_remove (pending_reversals,
+                                                         &key,
+                                                         pending_reversal))
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "No pending reversal found for address %s\n",
+                GNUNET_a2s (in, sizeof (struct sockaddr)));
   GNUNET_free (pending_reversal->in);
   GNUNET_free (pending_reversal);
 }
diff --git a/src/transport/test_transport_plugin_cmd_simple_send_performance.c b/src/transport/test_transport_plugin_cmd_simple_send_performance.c
index 17325e369..9cd780705 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send_performance.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send_performance.c
@@ -135,7 +135,7 @@ handle_test (void *cls,
     sender = GNUNET_new (struct Sender);
     sender->time_first = time_send;
     sender->mean_time = GNUNET_TIME_UNIT_ZERO;
-    GNUNET_CONTAINER_multipeermap_put (senders, peer, sender, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+    GNUNET_assert (GNUNET_OK == GNUNET_CONTAINER_multipeermap_put (senders, peer, sender, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
   }
 
   if (GNUNET_TIME_UNIT_ZERO.rel_value_us == sender->mean_time.rel_value_us)
@@ -146,7 +146,7 @@ handle_test (void *cls,
   }
   else
   {
-    double factor = sender->num_received/(sender->num_received + 1);
+    double factor = (double) sender->num_received/((double) sender->num_received + 1.0);
     struct GNUNET_TIME_Relative s1;
     struct GNUNET_TIME_Relative s2;
 
diff --git a/src/transport/transport_api_cmd_send_simple_performance.c b/src/transport/transport_api_cmd_send_simple_performance.c
index 7e195d9ef..d7850e007 100644
--- a/src/transport/transport_api_cmd_send_simple_performance.c
+++ b/src/transport/transport_api_cmd_send_simple_performance.c
@@ -66,12 +66,12 @@ struct SendSimplePerfState
   /**
    * Size of the message in bytes.
    */
-  int size;
+  unsigned int size;
 
   /**
    * Maximum number of messages per peer.
    */
-  int max_send;
+  unsigned int max_send;
 };
 
 struct MQWrapper
@@ -116,7 +116,7 @@ send_simple_single (void *cls)
   now = GNUNET_TIME_absolute_get ();
   mq_wrapper->num_send++;
   LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Sending simple test message with size %llu number %u with mq %p max %llu\n",
+       "Sending simple test message with size %u number %lu with mq %p max %u\n",
        mq_wrapper->sss->size,
        mq_wrapper->num_send,
        mq_wrapper->mq,