1 files changed, 70 insertions, 68 deletions

diff --git a/src/testing/test_testing_peerstartup2.c b/src/testing/test_testing_peerstartup2.c
index 80a3b719a..316a55951 100644
--- a/src/testing/test_testing_peerstartup2.c
+++ b/src/testing/test_testing_peerstartup2.c
@@ -30,18 +30,18 @@
 #include "gnunet_testing_lib.h"
 
 #define LOG(kind, ...)                           \
-  GNUNET_log(kind, __VA_ARGS__)
+  GNUNET_log (kind, __VA_ARGS__)
 
 
 #define FAIL_TEST(cond)                         \
   do {                                          \
-      if (!(cond)) {                              \
-          GNUNET_break(0);                         \
-          if (GNUNET_OK == status) {                \
-              status = GNUNET_SYSERR;                 \
-            }                                         \
-        }                                           \
-    } while (0)                                   \
+    if (! (cond)) {                              \
+      GNUNET_break (0);                         \
+      if (GNUNET_OK == status) {                \
+        status = GNUNET_SYSERR;                 \
+      }                                         \
+    }                                           \
+  } while (0)                                   \
 
 
 /**
@@ -52,7 +52,8 @@ int status;
 /**
  * The testing context
  */
-struct TestingContext {
+struct TestingContext
+{
   /**
    * The testing system
    */
@@ -71,7 +72,8 @@ struct TestingContext {
   /**
    * State
    */
-  enum {
+  enum
+  {
     PEER_INIT,
 
     PEER_STARTED,
@@ -82,17 +84,17 @@ struct TestingContext {
 
 
 static void
-do_shutdown2(void *cls)
+do_shutdown2 (void *cls)
 {
   struct TestingContext *test_ctx = cls;
 
   if (NULL != test_ctx->peer)
-    GNUNET_TESTING_peer_destroy(test_ctx->peer);
+    GNUNET_TESTING_peer_destroy (test_ctx->peer);
   if (NULL != test_ctx->cfg)
-    GNUNET_CONFIGURATION_destroy(test_ctx->cfg);
+    GNUNET_CONFIGURATION_destroy (test_ctx->cfg);
   if (NULL != test_ctx->system)
-    GNUNET_TESTING_system_destroy(test_ctx->system, GNUNET_YES);
-  GNUNET_free(test_ctx);
+    GNUNET_TESTING_system_destroy (test_ctx->system, GNUNET_YES);
+  GNUNET_free (test_ctx);
 }
 
 
@@ -102,29 +104,29 @@ do_shutdown2(void *cls)
  * @param cls the testing context
  */
 static void
-do_shutdown(void *cls);
+do_shutdown (void *cls);
 
 
 static void
-peer_status_cb(void *cls, struct GNUNET_TESTING_Peer *peer, int success)
+peer_status_cb (void *cls, struct GNUNET_TESTING_Peer *peer, int success)
 {
   struct TestingContext *test_ctx = cls;
 
   switch (test_ctx->state)
-    {
-    case PEER_INIT:
-      FAIL_TEST(0);
-      break;
-
-    case PEER_STARTED:
-      FAIL_TEST(GNUNET_YES == success);
-      test_ctx->state = PEER_STOPPED;
-      GNUNET_SCHEDULER_add_now(&do_shutdown2, cls);
-      break;
-
-    case PEER_STOPPED:
-      FAIL_TEST(0);
-    }
+  {
+  case PEER_INIT:
+    FAIL_TEST (0);
+    break;
+
+  case PEER_STARTED:
+    FAIL_TEST (GNUNET_YES == success);
+    test_ctx->state = PEER_STOPPED;
+    GNUNET_SCHEDULER_add_now (&do_shutdown2, cls);
+    break;
+
+  case PEER_STOPPED:
+    FAIL_TEST (0);
+  }
 }
 
 
@@ -134,20 +136,20 @@ peer_status_cb(void *cls, struct GNUNET_TESTING_Peer *peer, int success)
  * @param cls the testing context
  */
 static void
-do_shutdown(void *cls)
+do_shutdown (void *cls)
 {
   struct TestingContext *test_ctx = cls;
 
-  GNUNET_assert(NULL != test_ctx);
+  GNUNET_assert (NULL != test_ctx);
   if (NULL != test_ctx->peer)
-    {
-      FAIL_TEST(GNUNET_OK ==
-                GNUNET_TESTING_peer_stop_async(test_ctx->peer,
+  {
+    FAIL_TEST (GNUNET_OK ==
+               GNUNET_TESTING_peer_stop_async (test_ctx->peer,
                                                &peer_status_cb,
                                                test_ctx));
-    }
+  }
   else
-    do_shutdown2(test_ctx);
+    do_shutdown2 (test_ctx);
 }
 
 
@@ -155,51 +157,51 @@ do_shutdown(void *cls)
  * Main point of test execution
  */
 static void
-run(void *cls, char *const *args, const char *cfgfile,
-    const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   struct TestingContext *test_ctx;
   char *emsg;
   struct GNUNET_PeerIdentity id;
 
-  test_ctx = GNUNET_new(struct TestingContext);
+  test_ctx = GNUNET_new (struct TestingContext);
   test_ctx->system =
-    GNUNET_TESTING_system_create("test-gnunet-testing",
-                                 "127.0.0.1", NULL, NULL);
+    GNUNET_TESTING_system_create ("test-gnunet-testing",
+                                  "127.0.0.1", NULL, NULL);
   emsg = NULL;
   if (NULL == test_ctx->system)
     goto end;
-  test_ctx->cfg = GNUNET_CONFIGURATION_dup(cfg);
+  test_ctx->cfg = GNUNET_CONFIGURATION_dup (cfg);
   test_ctx->peer =
-    GNUNET_TESTING_peer_configure(test_ctx->system,
-                                  test_ctx->cfg,
-                                  0, &id, &emsg);
+    GNUNET_TESTING_peer_configure (test_ctx->system,
+                                   test_ctx->cfg,
+                                   0, &id, &emsg);
   if (NULL == test_ctx->peer)
-    {
-      if (NULL != emsg)
-        printf("Test failed upon error: %s", emsg);
-      goto end;
-    }
-  if (GNUNET_OK != GNUNET_TESTING_peer_start(test_ctx->peer))
+  {
+    if (NULL != emsg)
+      printf ("Test failed upon error: %s", emsg);
+    goto end;
+  }
+  if (GNUNET_OK != GNUNET_TESTING_peer_start (test_ctx->peer))
     goto end;
   test_ctx->state = PEER_STARTED;
-  FAIL_TEST(GNUNET_OK ==
-            GNUNET_TESTING_peer_stop_async(test_ctx->peer,
-                                           &peer_status_cb,
-                                           test_ctx));
-  GNUNET_TESTING_peer_stop_async_cancel(test_ctx->peer);
-  GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_SECONDS,
-                               &do_shutdown, test_ctx);
+  FAIL_TEST (GNUNET_OK ==
+             GNUNET_TESTING_peer_stop_async (test_ctx->peer,
+                                             &peer_status_cb,
+                                             test_ctx));
+  GNUNET_TESTING_peer_stop_async_cancel (test_ctx->peer);
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+                                &do_shutdown, test_ctx);
   return;
 
 end:
-  FAIL_TEST(0);
-  GNUNET_SCHEDULER_add_now(&do_shutdown, test_ctx);
-  GNUNET_free_non_null(emsg);
+  FAIL_TEST (0);
+  GNUNET_SCHEDULER_add_now (&do_shutdown, test_ctx);
+  GNUNET_free_non_null (emsg);
 }
 
 
-int main(int argc, char *argv[])
+int main (int argc, char *argv[])
 {
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
@@ -207,10 +209,10 @@ int main(int argc, char *argv[])
 
   status = GNUNET_OK;
   if (GNUNET_OK !=
-      GNUNET_PROGRAM_run(argc, argv,
-                         "test_testing_new_peerstartup",
-                         "test case for peerstartup using new testing library",
-                         options, &run, NULL))
+      GNUNET_PROGRAM_run (argc, argv,
+                          "test_testing_new_peerstartup",
+                          "test case for peerstartup using new testing library",
+                          options, &run, NULL))
     return 1;
   return (GNUNET_OK == status) ? 0 : 1;
 }