1 files changed, 48 insertions, 61 deletions

diff --git a/src/setup/gnunet-setup-transport-test.c b/src/setup/gnunet-setup-transport-test.c
index 4bc9c26c..87f8fc9f 100644
--- a/src/setup/gnunet-setup-transport-test.c
+++ b/src/setup/gnunet-setup-transport-test.c
@@ -48,9 +48,9 @@ struct TestContext
 
   /**
    * Name of widget to show on success.
-   */ 
+   */
   const char *success_image;
-                            
+
   /**
    * Name of widget to show on failure.
    */
@@ -66,39 +66,38 @@ struct TestContext
  * @param result GNUNET_YES on success
  */
 static void
-display_test_result (struct TestContext *tc,
-                     int result)
+display_test_result (struct TestContext *tc, int result)
 {
   GObject *w;
 
   if (GNUNET_YES != result)
-    {
-      w = GNUNET_SETUP_get_object (tc->failure_image);
-      if (NULL != w)
-        gtk_widget_show (GTK_WIDGET (w));
-      w = GNUNET_SETUP_get_object (tc->success_image);
-      if (NULL != w)      
-        gtk_widget_hide (GTK_WIDGET (w));
-    }
+  {
+    w = GNUNET_SETUP_get_object (tc->failure_image);
+    if (NULL != w)
+      gtk_widget_show (GTK_WIDGET (w));
+    w = GNUNET_SETUP_get_object (tc->success_image);
+    if (NULL != w)
+      gtk_widget_hide (GTK_WIDGET (w));
+  }
   else
-    {
-      w = GNUNET_SETUP_get_object (tc->failure_image);
-      if (NULL != w)      
-        gtk_widget_hide (GTK_WIDGET (w));
-      w = GNUNET_SETUP_get_object (tc->success_image);
-      if (NULL != w)
-        gtk_widget_show (GTK_WIDGET (w));
-    }
+  {
+    w = GNUNET_SETUP_get_object (tc->failure_image);
+    if (NULL != w)
+      gtk_widget_hide (GTK_WIDGET (w));
+    w = GNUNET_SETUP_get_object (tc->success_image);
+    if (NULL != w)
+      gtk_widget_show (GTK_WIDGET (w));
+  }
   if (GNUNET_SCHEDULER_NO_TASK != tc->tsk)
-    {
-      GNUNET_SCHEDULER_cancel (tc->tsk);
-      tc->tsk = GNUNET_SCHEDULER_NO_TASK;
-    }
+  {
+    GNUNET_SCHEDULER_cancel (tc->tsk);
+    tc->tsk = GNUNET_SCHEDULER_NO_TASK;
+  }
   if (NULL != tc->tst)
-    {
-      GNUNET_NAT_test_stop (tc->tst);
-      tc->tst = NULL;
-    }
+  {
+    GNUNET_NAT_test_stop (tc->tst);
+    tc->tst = NULL;
+  }
   GNUNET_free (tc);
 }
 
@@ -111,8 +110,7 @@ display_test_result (struct TestContext *tc,
  * @param success currently always GNUNET_OK
  */
 static void
-result_callback (void *cls,
-                 int success)
+result_callback (void *cls, int success)
 {
   struct TestContext *tc = cls;
 
@@ -128,8 +126,7 @@ result_callback (void *cls,
  * @param tc scheduler callback
  */
 static void
-fail_timeout (void *cls,
-              const struct GNUNET_SCHEDULER_TaskContext *tc)
+fail_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct TestContext *tstc = cls;
 
@@ -148,10 +145,9 @@ fail_timeout (void *cls,
  * @param failure_image image to show on failure
  */
 void
-GNUNET_setup_transport_test (const char *section_name,
-                             int is_tcp,
-                             const char *success_image,
-                             const char *failure_image)
+GNUNET_setup_transport_test (const char *section_name, int is_tcp,
+                             const char *success_image,
+                             const char *failure_image)
 {
   struct TestContext *tc;
   unsigned long long bnd_port;
@@ -159,19 +155,15 @@ GNUNET_setup_transport_test (const char *section_name,
   GtkWidget *w;
 
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (cfg, 
-                                             section_name,
-                                             "PORT",
-                                             &bnd_port))
-    {
-      GNUNET_break (0);
-      return;
-    }
+      GNUNET_CONFIGURATION_get_value_number (cfg, section_name, "PORT",
+                                             &bnd_port))
+  {
+    GNUNET_break (0);
+    return;
+  }
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (cfg, 
-                                             section_name,
-                                             "ADVERTISED_PORT",
-                                             &adv_port))
+      GNUNET_CONFIGURATION_get_value_number (cfg, section_name,
+                                             "ADVERTISED_PORT", &adv_port))
     adv_port = bnd_port;
   tc = GNUNET_malloc (sizeof (struct TestContext));
   tc->success_image = success_image;
@@ -180,20 +172,15 @@ GNUNET_setup_transport_test (const char *section_name,
   gtk_widget_hide (w);
   GNUNET_assert (NULL != cfg);
   GNUNET_RESOLVER_connect (cfg);
-  tc->tst = GNUNET_NAT_test_start (cfg,
-                                   is_tcp,
-                                   (uint16_t) bnd_port,
-                                   (uint16_t) adv_port,
-                                   &result_callback,
-                                   tc);
+  tc->tst =
+      GNUNET_NAT_test_start (cfg, is_tcp, (uint16_t) bnd_port,
+                             (uint16_t) adv_port, &result_callback, tc);
   if (NULL == tc->tst)
-    {
-      display_test_result (tc, GNUNET_SYSERR);
-      return;
-    }
-  tc->tsk = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
-                                          &fail_timeout,
-                                          tc);
+  {
+    display_test_result (tc, GNUNET_SYSERR);
+    return;
+  }
+  tc->tsk = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &fail_timeout, tc);
 }
 
 /* end of gnunet-setup-transport-test.c */