-code cleanup and better error messages for failures

1 files changed, 26 insertions, 36 deletions

diff --git a/src/dht/test_dht_topo.c b/src/dht/test_dht_topo.c
index f69f5dca9..03fe49408 100644
--- a/src/dht/test_dht_topo.c
+++ b/src/dht/test_dht_topo.c
@@ -53,11 +53,6 @@
 static int ok;
 
 /**
- * Be verbose
- */
-static int verbose;
-
-/**
  * Total number of peers in the test.
  */
 static unsigned long long num_peers;
@@ -114,27 +109,30 @@ static GNUNET_SCHEDULER_TaskIdentifier shutdown_handle;
 
 static char *topology_file;
 
-struct GNUNET_TESTING_Daemon *d1;
+static struct GNUNET_TESTING_Daemon *d1;
+
+static struct GNUNET_TESTING_Daemon *d2;
 
-struct GNUNET_TESTING_Daemon *d2;
+static struct GNUNET_DHT_Handle **hs;
 
-struct GNUNET_DHT_Handle **hs;
+static struct GNUNET_DHT_GetHandle *get_h;
 
-struct GNUNET_DHT_GetHandle *get_h;
+static struct GNUNET_DHT_GetHandle *get_h_2;
 
-struct GNUNET_DHT_GetHandle *get_h_2;
+static struct GNUNET_DHT_GetHandle *get_h_far;
 
-struct GNUNET_DHT_GetHandle *get_h_far;
+static int found_1;
 
-int found_1;
-int found_2;
-int found_far;
+static int found_2;
+
+static int found_far;
 
 /**
  * Which topology are we to run
  */
 static int test_topology;
 
+
 /**
  * Check whether peers successfully shut down.
  */
@@ -193,6 +191,7 @@ disconnect_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   shutdown_handle = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
 }
 
+
 static void
 dht_get_id_handler (void *cls, struct GNUNET_TIME_Absolute exp,
                     const GNUNET_HashCode * key,
@@ -246,14 +245,15 @@ dht_get_id_handler (void *cls, struct GNUNET_TIME_Absolute exp,
     default:
       GNUNET_break(0);
   }
-  if (TORUS == test_topology &&
-      (found_1 == 0 || found_2 == 0 || found_far == 0))
+  if ( (TORUS == test_topology) &&
+       ( (found_1 == 0) || (found_2 == 0) || (found_far == 0)) )
     return;
   ok = 0;
   GNUNET_SCHEDULER_cancel (disconnect_task);
   disconnect_task = GNUNET_SCHEDULER_add_now (&disconnect_peers, NULL);
 }
 
+
 static void
 do_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
@@ -393,7 +393,8 @@ peergroup_ready (void *cls, const char *emsg)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Peergroup callback called with error, aborting test!\n");
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Error from testing: `%s'\n",
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+                "Error from testing: `%s'\n",
                 emsg);
     ok++;
     GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
@@ -450,7 +451,6 @@ connect_cb (void *cls, const struct GNUNET_PeerIdentity *first,
             struct GNUNET_TESTING_Daemon *first_daemon,
             struct GNUNET_TESTING_Daemon *second_daemon, const char *emsg)
 {
-
   if (emsg == NULL)
   {
     total_connections++;
@@ -462,7 +462,6 @@ connect_cb (void *cls, const struct GNUNET_PeerIdentity *first,
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 "Problem with new connection (%s)\n", emsg);
   }
-
 }
 
 
@@ -556,30 +555,21 @@ run (void *cls, char *const *args, const char *cfgfile,
 }
 
 
-
-/**
- * test_dht_2d command line options
- */
-static struct GNUNET_GETOPT_CommandLineOption options[] = {
-  {'V', "verbose", NULL,
-   gettext_noop ("be verbose (print progress information)"),
-   0, &GNUNET_GETOPT_set_one, &verbose},
-  GNUNET_GETOPT_OPTION_END
-};
-
-
 /**
  * Main: start test
  */
 int
 main (int xargc, char *xargv[])
 {
-  char *const argv_torus[] = { "test-dht-2dtorus",
+  static struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_OPTION_END
+  };
+  static char *const argv_torus[] = { "test-dht-2dtorus",
     "-c",
     "test_dht_2dtorus.conf",
     NULL
   };
-  char *const argv_line[] = { "test-dht-line",
+  static char *const argv_line[] = { "test-dht-line",
     "-c",
     "test_dht_line.conf",
     NULL
@@ -612,17 +602,17 @@ main (int xargc, char *xargv[])
 #if REMOVE_DIR
   GNUNET_DISK_directory_remove ("/tmp/test_dht_topo");
 #endif
-  if (found_1 == 0)
+  if (0 == found_1)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "ID 1 not found!\n");
   }
   if (TORUS == test_topology)
   {
-    if (found_2 == 0)
+    if (0 == found_2)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "ID 2 not found!\n");
     }
-    if (found_far == 0)
+    if (0 == found_far)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "ID far not found!\n");
     }