-fix

1 files changed, 16 insertions, 15 deletions

diff --git a/src/dv/test_transport_api_dv.c b/src/dv/test_transport_api_dv.c
index ef3ba4e7c..e36622f2f 100644
--- a/src/dv/test_transport_api_dv.c
+++ b/src/dv/test_transport_api_dv.c
@@ -484,6 +484,7 @@ static struct GNUNET_CORE_MessageHandler handlers[] = {
   {NULL, 0, 0}
 };
 
+
 /**
  * Notify of all peer1's peers, once peer 2 is found, schedule connect
  * to peer two for message send.
@@ -525,6 +526,7 @@ connect_notify_peer2 (void *cls, const struct GNUNET_PeerIdentity *peer,
   }
 }
 
+
 static void
 init_notify_peer2 (void *cls, struct GNUNET_CORE_Handle *server,
                    const struct GNUNET_PeerIdentity *my_identity)
@@ -535,6 +537,7 @@ init_notify_peer2 (void *cls, struct GNUNET_CORE_Handle *server,
   total_server_connections++;
 }
 
+
 /**
  * Notify of all peer1's peers, once peer 2 is found, schedule connect
  * to peer two for message send.
@@ -566,6 +569,7 @@ connect_notify_peer1 (void *cls, const struct GNUNET_PeerIdentity *peer,
   }
 }
 
+
 static void
 init_notify_peer1 (void *cls, struct GNUNET_CORE_Handle *server,
                    const struct GNUNET_PeerIdentity *my_identity)
@@ -624,6 +628,7 @@ send_test_messages (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   }
 }
 
+
 static void
 send_other_messages (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
@@ -706,6 +711,7 @@ send_other_messages (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                                     "from send_other_messages");
 }
 
+
 static void
 topology_callback (void *cls, const struct GNUNET_PeerIdentity *first,
                    const struct GNUNET_PeerIdentity *second, uint32_t distance,
@@ -860,6 +866,7 @@ all_connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer,
   }
 }
 
+
 static void
 peers_started_callback (void *cls, const struct GNUNET_PeerIdentity *id,
                         const struct GNUNET_CONFIGURATION_Handle *cfg,
@@ -926,6 +933,7 @@ peers_started_callback (void *cls, const struct GNUNET_PeerIdentity *id,
   }
 }
 
+
 /**
  * Callback indicating that the hostkey was created for a peer.
  *
@@ -981,6 +989,7 @@ hostkey_callback (void *cls, const struct GNUNET_PeerIdentity *id,
   }
 }
 
+
 static void
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
@@ -1116,8 +1125,9 @@ run (void *cls, char *const *args, const char *cfgfile,
 
 }
 
-static int
-check ()
+
+int
+main (int argc, char *argv[])
 {
   int ret;
 
@@ -1129,6 +1139,9 @@ check ()
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
+  GNUNET_log_setup ("test-transport-dv",
+                    "WARNING",
+                    NULL);
   ret =
       GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
                           "test-transport-dv", "nohelp", options, &run, &ok);
@@ -1137,18 +1150,6 @@ check ()
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 "`test-transport-dv': Failed with error code %d\n", ret);
   }
-  return ok;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int ret;
-
-  GNUNET_log_setup ("test-transport-dv",
-                    "WARNING",
-                    NULL);
-  ret = check ();
   /**
    * Need to remove base directory, subdirectories taken care
    * of by the testing framework.
@@ -1158,7 +1159,7 @@ main (int argc, char *argv[])
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 "Failed to remove testing directory %s\n", test_directory);
   }
-  return ret;
+  return (GNUNET_OK == ret) ? 0 : 1;
 }
 
 /* end of test_transport_api_dv.c */