indentation

1 files changed, 33 insertions, 37 deletions

diff --git a/src/testing/test_testing_reconnect.c b/src/testing/test_testing_reconnect.c
index 7cec78f98..1e028779f 100644
--- a/src/testing/test_testing_reconnect.c
+++ b/src/testing/test_testing_reconnect.c
@@ -54,51 +54,50 @@ static int phase;
  * Run the next phase of starting daemons, connecting them and
  * stopping them again.
  */
-static void 
-run_phase ();
+static void run_phase ();
 
 static void
 end2_cb (void *cls, const char *emsg)
 {
 
   if (emsg != NULL)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Ending with error: %s\n", emsg);
-      ok = 1;
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Ending with error: %s\n", emsg);
+    ok = 1;
+  }
   else
+  {
+    if (phase < NUM_PHASES)
     {
-      if (phase < NUM_PHASES)
-        {
-          fprintf (stderr, ".");
-          run_phase();
-          return;
-        }
-      fprintf (stderr, ".\n");
+      fprintf (stderr, ".");
+      run_phase ();
+      return;
+    }
+    fprintf (stderr, ".\n");
 #if VERBOSE
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Both daemons terminated, will now exit.\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Both daemons terminated, will now exit.\n");
 #endif
-      ok = 0;
-    }
+    ok = 0;
+  }
 }
 
 static void
 end1_cb (void *cls, const char *emsg)
 {
   if (emsg != NULL)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Stopping daemon 1 gave: %s\n",
-                  emsg);
-      ok = 1;
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Stopping daemon 1 gave: %s\n",
+                emsg);
+    ok = 1;
+  }
   else
-    {
-      ok = 0;
-    }
+  {
+    ok = 0;
+  }
 
   GNUNET_TESTING_daemon_stop (d2, TIMEOUT, &end2_cb, NULL,
-                              (phase == NUM_PHASES) ? GNUNET_YES : GNUNET_NO,
+                              (phase == NUM_PHASES) ? GNUNET_YES : GNUNET_NO,
                               GNUNET_NO);
   d2 = NULL;
 }
@@ -106,8 +105,8 @@ end1_cb (void *cls, const char *emsg)
 static void
 finish_testing (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_TESTING_daemon_stop (d1, TIMEOUT, &end1_cb, NULL, 
-                              (phase == NUM_PHASES) ? GNUNET_YES : GNUNET_NO,
+  GNUNET_TESTING_daemon_stop (d1, TIMEOUT, &end1_cb, NULL,
+                              (phase == NUM_PHASES) ? GNUNET_YES : GNUNET_NO,
                               GNUNET_NO);
   d1 = NULL;
 }
@@ -147,8 +146,7 @@ my_cb2 (void *cls,
 #endif
   GNUNET_TESTING_daemons_connect (d1, d2,
                                   TIMEOUT, CONNECT_ATTEMPTS,
-                                  GNUNET_YES,
-                                  &my_connect_complete, NULL);
+                                  GNUNET_YES, &my_connect_complete, NULL);
 }
 
 
@@ -163,9 +161,8 @@ my_cb1 (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Daemon `%s' started.\n", GNUNET_i2s (id));
 #endif
-  d2 =
-    GNUNET_TESTING_daemon_start (c2, TIMEOUT, GNUNET_NO, NULL, NULL, 0, NULL, NULL, NULL,
-                                 &my_cb2, NULL);
+  d2 = GNUNET_TESTING_daemon_start (c2, TIMEOUT, GNUNET_NO, NULL, NULL, 0, NULL,
+                                    NULL, NULL, &my_cb2, NULL);
   GNUNET_assert (d2 != NULL);
 }
 
@@ -186,13 +183,12 @@ run (void *cls,
   run_phase ();
 }
 
-static void 
+static void
 run_phase ()
 {
   phase++;
-  d1 =
-    GNUNET_TESTING_daemon_start (c1, TIMEOUT, GNUNET_NO, NULL, NULL, 0, NULL, NULL, NULL,
-                                 &my_cb1, NULL);
+  d1 = GNUNET_TESTING_daemon_start (c1, TIMEOUT, GNUNET_NO, NULL, NULL, 0, NULL,
+                                    NULL, NULL, &my_cb1, NULL);
   GNUNET_assert (d1 != NULL);
 }