Imported Upstream version 0.9.5aupstream

1 files changed, 6 insertions, 28 deletions

diff --git a/src/util/test_connection_timeout.c b/src/util/test_connection_timeout.c
index c0597b2..8d3f775 100644
--- a/src/util/test_connection_timeout.c
+++ b/src/util/test_connection_timeout.c
@@ -27,8 +27,6 @@
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_time_lib.h"
 
-#define VERBOSE GNUNET_NO
-
 #define PORT 12435
 
 static struct GNUNET_CONNECTION_Handle *csock;
@@ -78,18 +76,14 @@ send_kilo (void *cls, size_t size, void *buf)
 
   if (size == 0)
   {
-#if VERBOSE
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got the desired timeout!\n");
-#endif
     GNUNET_assert (buf == NULL);
     *ok = 0;
     GNUNET_CONNECTION_destroy (lsock);
     GNUNET_CONNECTION_destroy (csock);
     return 0;
   }
-#if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending kilo to fill buffer.\n");
-#endif
   GNUNET_assert (size >= 1024);
   memset (buf, 42, 1024);
 
@@ -117,15 +111,15 @@ task_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 }
 
 
-
-/**
- * Main method, starts scheduler with task_timeout.
- */
-static int
-check_timeout ()
+int
+main (int argc, char *argv[])
 {
   int ok;
 
+  GNUNET_log_setup ("test_connection_timeout",
+                    "WARNING",
+                    NULL);
+
   ok = 1;
   cfg = GNUNET_CONFIGURATION_create ();
   GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME",
@@ -135,20 +129,4 @@ check_timeout ()
   return ok;
 }
 
-int
-main (int argc, char *argv[])
-{
-  int ret = 0;
-
-  GNUNET_log_setup ("test_connection_timeout",
-#if VERBOSE
-                    "DEBUG",
-#else
-                    "WARNING",
-#endif
-                    NULL);
-  ret += check_timeout ();
-  return ret;
-}
-
 /* end of test_connection_timeout.c */