- fix coverity

[oweals/gnunet.git] / src / transport / test_quota_compliance.c

diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c
index 250d3279f4e0d85fd914b028e332a86337635ab6..3889aa0ef796bf753003c20e20a8e55d6408cb76 100644 (file)
--- a/src/transport/test_quota_compliance.c
+++ b/src/transport/test_quota_compliance.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009, 2010, 2011 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009, 2010, 2011 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /**
  * @file transport/test_quota_compliance.c
@@ -73,7 +73,7 @@ unsigned long long quota_out_p2;
 
 struct GNUNET_TRANSPORT_TESTING_handle *tth;
 
-static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
+static struct GNUNET_TRANSPORT_TESTING_ConnectRequest * cc;
 
 
 /*
@@ -209,23 +209,29 @@ get_size (unsigned int iter)
 
 
 static void
-notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
+notify_receive (void *cls,
+                const struct GNUNET_PeerIdentity *peer,
                 const struct GNUNET_MessageHeader *message)
 {
   const struct TestMessage *hdr;
+  struct PeerContext *p = cls;
 
   hdr = (const struct TestMessage *) message;
   if (MTYPE != ntohs (message->type))
     return;
 
-  struct PeerContext *p = cls;
-  char *ps = GNUNET_strdup (GNUNET_i2s (&p->id));
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Peer %u (`%s') got message %u of size %u from peer (`%s')\n",
-              p->no, ps, ntohl (hdr->num), ntohs (message->size),
-              GNUNET_i2s (peer));
-  GNUNET_free (ps);
+  {
+    char *ps = GNUNET_strdup (GNUNET_i2s (&p->id));
+
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Peer %u (`%s') got message %u of size %u from peer (`%s')\n",
+                p->no,
+                ps,
+                ntohl (hdr->num),
+                ntohs (message->size),
+                GNUNET_i2s (peer));
+    GNUNET_free (ps);
+  }
 }
 
 
@@ -315,8 +321,10 @@ notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer)
 
   struct PeerContext *p = cls;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%4s') connected to us!\n",
-              p->no, GNUNET_i2s (peer));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Peer %u (`%4s') connected to us!\n",
+              p->no,
+              GNUNET_i2s (peer));
 }
 
 
@@ -325,7 +333,9 @@ notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
 {
   struct PeerContext *p = cls;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%4s') disconnected!\n", p->no,
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Peer %u (`%4s') disconnected!\n",
+              p->no,
               GNUNET_i2s (peer));
   if (th != NULL)
     GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
@@ -344,7 +354,7 @@ sendtask ()
 
 
 static void
-measure (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+measure (void *cls)
 {
   static int counter;
 
@@ -415,7 +425,6 @@ static char *
 generate_config (char *cfg_file, unsigned long long quota_in,
                  unsigned long long quota_out)
 {
-  char *networks[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkTypeString;
   char *in_name;
   char *out_name;
   char *fname = NULL;
@@ -430,12 +439,16 @@ generate_config (char *cfg_file, unsigned long long quota_in,
 
   for (c = 0; c < GNUNET_ATS_NetworkTypeCount; c++)
   {
-      GNUNET_asprintf (&in_name, "%s_QUOTA_IN", networks[c]);
-      GNUNET_asprintf (&out_name, "%s_QUOTA_OUT", networks[c]);
-      GNUNET_CONFIGURATION_set_value_number (cfg, "ats", in_name, quota_in);
-      GNUNET_CONFIGURATION_set_value_number (cfg, "ats", out_name, quota_out);
-      GNUNET_free (in_name);
-      GNUNET_free (out_name);
+    GNUNET_asprintf (&in_name,
+                     "%s_QUOTA_IN",
+                     GNUNET_ATS_print_network_type (c));
+    GNUNET_asprintf (&out_name,
+                     "%s_QUOTA_OUT",
+                     GNUNET_ATS_print_network_type (c));
+    GNUNET_CONFIGURATION_set_value_number (cfg, "ats", in_name, quota_in);
+    GNUNET_CONFIGURATION_set_value_number (cfg, "ats", out_name, quota_out);
+    GNUNET_free (in_name);
+    GNUNET_free (out_name);
   }
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_write (cfg, fname));
   GNUNET_CONFIGURATION_destroy (cfg);