1 files changed, 73 insertions, 73 deletions

diff --git a/src/testbed/test_testbed_api_test.c b/src/testbed/test_testbed_api_test.c
index 3f8f536e7..f0d8d1d25 100644
--- a/src/testbed/test_testbed_api_test.c
+++ b/src/testbed/test_testbed_api_test.c
@@ -33,7 +33,7 @@
  * Generic logging shortcut
  */
 #define LOG(kind, ...)                           \
-  GNUNET_log(kind, __VA_ARGS__)
+  GNUNET_log (kind, __VA_ARGS__)
 
 /**
  * Number of peers we want to start
@@ -53,12 +53,12 @@ static struct GNUNET_TESTBED_Operation *op;
 /**
  * Abort task identifier
  */
-static struct GNUNET_SCHEDULER_Task * abort_task;
+static struct GNUNET_SCHEDULER_Task *abort_task;
 
 /**
  * shutdown task identifier
  */
-static struct GNUNET_SCHEDULER_Task * shutdown_task;
+static struct GNUNET_SCHEDULER_Task *shutdown_task;
 
 /**
  * Testing result
@@ -72,30 +72,30 @@ static int result;
  * @param cls NULL
  */
 static void
-do_shutdown(void *cls)
+do_shutdown (void *cls)
 {
   shutdown_task = NULL;
   if (NULL != abort_task)
-    GNUNET_SCHEDULER_cancel(abort_task);
+    GNUNET_SCHEDULER_cancel (abort_task);
   if (NULL != op)
-    GNUNET_TESTBED_operation_done(op);
-  GNUNET_SCHEDULER_shutdown();
+    GNUNET_TESTBED_operation_done (op);
+  GNUNET_SCHEDULER_shutdown ();
 }
 
 /**
  * shortcut to exit during failure
  */
 #define FAIL_TEST(cond) do {                                            \
-      if (!(cond)) {                                                      \
-          GNUNET_break(0);                                                  \
-          if (NULL != abort_task)                       \
-          GNUNET_SCHEDULER_cancel (abort_task);                           \
-          abort_task = NULL;                            \
-          if (NULL == shutdown_task)                    \
-          shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);   \
-          return;                                                           \
-        }                                                                   \
-  } while (0)
+    if (! (cond)) {                                                      \
+      GNUNET_break (0);                                                  \
+      if (NULL != abort_task)                       \
+        GNUNET_SCHEDULER_cancel (abort_task);                           \
+      abort_task = NULL;                            \
+      if (NULL == shutdown_task)                    \
+        shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);   \
+      return;                                                           \
+    }                                                                   \
+} while (0)
 
 
 /**
@@ -104,13 +104,13 @@ do_shutdown(void *cls)
  * @param cls NULL
  */
 static void
-do_abort(void *cls)
+do_abort (void *cls)
 {
-  LOG(GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n");
+  LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n");
   abort_task = NULL;
   if (NULL != shutdown_task)
-    GNUNET_SCHEDULER_cancel(shutdown_task);
-  do_shutdown(cls);
+    GNUNET_SCHEDULER_cancel (shutdown_task);
+  do_shutdown (cls);
 }
 
 
@@ -124,19 +124,19 @@ do_abort(void *cls)
  *          operation is successfull
  */
 static void
-peerinfo_cb(void *cb_cls, struct GNUNET_TESTBED_Operation *op_,
-            const struct GNUNET_TESTBED_PeerInformation *pinfo,
-            const char *emsg)
+peerinfo_cb (void *cb_cls, struct GNUNET_TESTBED_Operation *op_,
+             const struct GNUNET_TESTBED_PeerInformation *pinfo,
+             const char *emsg)
 {
-  FAIL_TEST(op == op_);
-  FAIL_TEST(NULL == cb_cls);
-  FAIL_TEST(NULL == emsg);
-  FAIL_TEST(GNUNET_TESTBED_PIT_IDENTITY == pinfo->pit);
-  FAIL_TEST(NULL != pinfo->result.id);
-  GNUNET_TESTBED_operation_done(op);
+  FAIL_TEST (op == op_);
+  FAIL_TEST (NULL == cb_cls);
+  FAIL_TEST (NULL == emsg);
+  FAIL_TEST (GNUNET_TESTBED_PIT_IDENTITY == pinfo->pit);
+  FAIL_TEST (NULL != pinfo->result.id);
+  GNUNET_TESTBED_operation_done (op);
   op = NULL;
   result = GNUNET_OK;
-  shutdown_task = GNUNET_SCHEDULER_add_now(&do_shutdown, NULL);
+  shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
 }
 
 
@@ -149,19 +149,19 @@ peerinfo_cb(void *cb_cls, struct GNUNET_TESTBED_Operation *op_,
  *          operation has executed successfully.
  */
 static void
-op_comp_cb(void *cls, struct GNUNET_TESTBED_Operation *op_, const char *emsg)
+op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op_, const char *emsg)
 {
-  FAIL_TEST(NULL == cls);
-  FAIL_TEST(op == op_);
+  FAIL_TEST (NULL == cls);
+  FAIL_TEST (op == op_);
   if (NULL != emsg)
-    {
-      LOG(GNUNET_ERROR_TYPE_WARNING, "%s\n", emsg);
-      FAIL_TEST(0);
-    }
-  GNUNET_TESTBED_operation_done(op);
-  op = GNUNET_TESTBED_peer_get_information(peers[0],
-                                           GNUNET_TESTBED_PIT_IDENTITY,
-                                           &peerinfo_cb, NULL);
+  {
+    LOG (GNUNET_ERROR_TYPE_WARNING, "%s\n", emsg);
+    FAIL_TEST (0);
+  }
+  GNUNET_TESTBED_operation_done (op);
+  op = GNUNET_TESTBED_peer_get_information (peers[0],
+                                            GNUNET_TESTBED_PIT_IDENTITY,
+                                            &peerinfo_cb, NULL);
 }
 
 
@@ -172,19 +172,19 @@ op_comp_cb(void *cls, struct GNUNET_TESTBED_Operation *op_, const char *emsg)
  * @param event the controller event
  */
 static void
-controller_event_cb(void *cls,
-                    const struct GNUNET_TESTBED_EventInformation *event)
+controller_event_cb (void *cls,
+                     const struct GNUNET_TESTBED_EventInformation *event)
 {
   switch (event->type)
-    {
-    case GNUNET_TESTBED_ET_CONNECT:
-      FAIL_TEST(event->details.peer_connect.peer1 == peers[0]);
-      FAIL_TEST(event->details.peer_connect.peer2 == peers[1]);
-      break;
-
-    default:
-      FAIL_TEST(0);
-    }
+  {
+  case GNUNET_TESTBED_ET_CONNECT:
+    FAIL_TEST (event->details.peer_connect.peer1 == peers[0]);
+    FAIL_TEST (event->details.peer_connect.peer2 == peers[1]);
+    break;
+
+  default:
+    FAIL_TEST (0);
+  }
 }
 
 
@@ -201,27 +201,27 @@ controller_event_cb(void *cls,
  *          failed
  */
 static void
-test_master(void *cls,
-            struct GNUNET_TESTBED_RunHandle *h,
-            unsigned int num_peers,
-            struct GNUNET_TESTBED_Peer **peers_,
-            unsigned int links_succeeded,
-            unsigned int links_failed)
+test_master (void *cls,
+             struct GNUNET_TESTBED_RunHandle *h,
+             unsigned int num_peers,
+             struct GNUNET_TESTBED_Peer **peers_,
+             unsigned int links_succeeded,
+             unsigned int links_failed)
 {
   unsigned int peer;
 
-  FAIL_TEST(NULL == cls);
-  FAIL_TEST(NUM_PEERS == num_peers);
-  FAIL_TEST(NULL != peers_);
+  FAIL_TEST (NULL == cls);
+  FAIL_TEST (NUM_PEERS == num_peers);
+  FAIL_TEST (NULL != peers_);
   for (peer = 0; peer < num_peers; peer++)
-    FAIL_TEST(NULL != peers_[peer]);
+    FAIL_TEST (NULL != peers_[peer]);
   peers = peers_;
-  op = GNUNET_TESTBED_overlay_connect(NULL, &op_comp_cb, NULL, peers[0],
-                                      peers[1]);
+  op = GNUNET_TESTBED_overlay_connect (NULL, &op_comp_cb, NULL, peers[0],
+                                       peers[1]);
   abort_task =
-    GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply
-                                   (GNUNET_TIME_UNIT_MINUTES, 3), &do_abort,
-                                 NULL);
+    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+                                    (GNUNET_TIME_UNIT_MINUTES, 3), &do_abort,
+                                  NULL);
 }
 
 
@@ -229,7 +229,7 @@ test_master(void *cls,
  * Main function
  */
 int
-main(int argc, char **argv)
+main (int argc, char **argv)
 {
   uint64_t event_mask;
 
@@ -237,10 +237,10 @@ main(int argc, char **argv)
   event_mask = 0;
   event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
   event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
-  (void)GNUNET_TESTBED_test_run("test_testbed_api_test",
-                                "test_testbed_api.conf", NUM_PEERS,
-                                event_mask, &controller_event_cb, NULL,
-                                &test_master, NULL);
+  (void) GNUNET_TESTBED_test_run ("test_testbed_api_test",
+                                  "test_testbed_api.conf", NUM_PEERS,
+                                  event_mask, &controller_event_cb, NULL,
+                                  &test_master, NULL);
   if (GNUNET_OK != result)
     return 1;
   return 0;