curly wars / auto-indentation

6 files changed, 36 insertions, 32 deletions

diff --git a/src/testing/test_testing_connect.c b/src/testing/test_testing_connect.c
index f32e2e40f..87501469d 100644
--- a/src/testing/test_testing_connect.c
+++ b/src/testing/test_testing_connect.c
@@ -148,10 +148,12 @@ run (void *cls, char *const *args, const char *cfgfile,
 #endif
   c1 = GNUNET_CONFIGURATION_create ();
   GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONFIGURATION_load (c1, "test_testing_connect_peer1.conf"));
+                 GNUNET_CONFIGURATION_load (c1,
+                                            "test_testing_connect_peer1.conf"));
   c2 = GNUNET_CONFIGURATION_create ();
   GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONFIGURATION_load (c2, "test_testing_connect_peer2.conf"));
+                 GNUNET_CONFIGURATION_load (c2,
+                                            "test_testing_connect_peer2.conf"));
   d1 = GNUNET_TESTING_daemon_start (c1, TIMEOUT, GNUNET_NO, NULL, NULL, 0, NULL,
                                     NULL, NULL, &my_cb1, NULL);
   GNUNET_assert (d1 != NULL);
diff --git a/src/testing/test_testing_reconnect.c b/src/testing/test_testing_reconnect.c
index f317040fb..20c628c6a 100644
--- a/src/testing/test_testing_reconnect.c
+++ b/src/testing/test_testing_reconnect.c
@@ -101,8 +101,8 @@ end1_cb (void *cls, const char *emsg)
   if (d2 != NULL)
   {
     GNUNET_TESTING_daemon_stop (d2, TIMEOUT, &end2_cb, NULL,
-                                (phase == NUM_PHASES) ? GNUNET_YES : GNUNET_NO,
-                                GNUNET_NO);
+                                (phase == NUM_PHASES) ? GNUNET_YES : GNUNET_NO,
+                                GNUNET_NO);
     d2 = NULL;
   }
 }
@@ -192,9 +192,13 @@ run (void *cls, char *const *args, const char *cfgfile,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemon.\n");
 #endif
   c1 = GNUNET_CONFIGURATION_create ();
-  GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (c1, "test_testing_connect_peer1.conf"));
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_CONFIGURATION_load (c1,
+                                            "test_testing_connect_peer1.conf"));
   c2 = GNUNET_CONFIGURATION_create ();
-  GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (c2, "test_testing_connect_peer2.conf"));
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_CONFIGURATION_load (c2,
+                                            "test_testing_connect_peer2.conf"));
   run_phase ();
 }
 
diff --git a/src/testing/test_testing_topology.c b/src/testing/test_testing_topology.c
index e563f4d64..deaeae457 100644
--- a/src/testing/test_testing_topology.c
+++ b/src/testing/test_testing_topology.c
@@ -349,7 +349,7 @@ static int
 process_mtype (void *cls, const struct GNUNET_PeerIdentity *peer,
                const struct GNUNET_MessageHeader *message,
                const struct GNUNET_ATS_Information *atsi,
-               unsigned int atsi_count)
+               unsigned int atsi_count)
 {
   char *dotOutFileNameFinished;
   FILE *dotOutFileFinished;
@@ -543,7 +543,7 @@ init_notify_peer2 (void *cls, struct GNUNET_CORE_Handle *server,
 static void
 connect_notify_peers (void *cls, const struct GNUNET_PeerIdentity *peer,
                       const struct GNUNET_ATS_Information *atsi,
-                      unsigned int atsi_count)
+                      unsigned int atsi_count)
 {
   struct TestMessageContext *pos = cls;
 
@@ -604,8 +604,7 @@ init_notify_peer1 (void *cls, struct GNUNET_CORE_Handle *server,
    */
   pos->peer2handle =
       GNUNET_CORE_connect (pos->peer2->cfg, 1, pos, &init_notify_peer2, NULL,
-                           NULL, NULL, GNUNET_YES, NULL, GNUNET_YES,
-                           handlers);
+                           NULL, NULL, GNUNET_YES, NULL, GNUNET_YES, handlers);
 
 }
 
@@ -643,8 +642,8 @@ send_test_messages (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
    */
   pos->peer1handle =
       GNUNET_CORE_connect (pos->peer1->cfg, 1, pos, &init_notify_peer1,
-                           &connect_notify_peers, NULL, NULL, GNUNET_NO,
-                           NULL, GNUNET_NO, no_handlers);
+                           &connect_notify_peers, NULL, NULL, GNUNET_NO, NULL,
+                           GNUNET_NO, no_handlers);
 
   GNUNET_assert (pos->peer1handle != NULL);
 
diff --git a/src/testing/testing.c b/src/testing/testing.c
index e81a92fb5..6edc1fc8c 100644
--- a/src/testing/testing.c
+++ b/src/testing/testing.c
@@ -1888,7 +1888,7 @@ notify_connect_result (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 static void
 connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer,
                 const struct GNUNET_ATS_Information *atsi,
-                unsigned int atsi_count)
+                unsigned int atsi_count)
 {
   struct GNUNET_TESTING_ConnectContext *ctx = cls;
 
@@ -1965,8 +1965,7 @@ core_init_notify (void *cls, struct GNUNET_CORE_Handle *server,
 
   if (connect_ctx->send_hello == GNUNET_NO)
   {
-    GNUNET_TRANSPORT_try_connect (connect_ctx->d1th,
-                                  &connect_ctx->d2->id);
+    GNUNET_TRANSPORT_try_connect (connect_ctx->d1th, &connect_ctx->d2->id);
 #if DEBUG_TESTING
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Sending connect request to TRANSPORT of %s for peer %s\n",
@@ -2088,7 +2087,7 @@ reattempt_daemons_connect (void *cls,
 static void
 core_initial_iteration (void *cls, const struct GNUNET_PeerIdentity *peer,
                         const struct GNUNET_ATS_Information *atsi,
-                        unsigned int atsi_count)
+                        unsigned int atsi_count)
 {
   struct GNUNET_TESTING_ConnectContext *ctx = cls;
 
diff --git a/src/testing/testing_group.c b/src/testing/testing_group.c
index 04c2cfd00..171cf1c48 100644
--- a/src/testing/testing_group.c
+++ b/src/testing/testing_group.c
@@ -2669,8 +2669,8 @@ create_from_file (struct GNUNET_TESTING_PeerGroup *pg, char *filename,
         return connect_attempts;
       }
 #if DEBUG_TESTING
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Found %u total peers in topology\n", total_peers);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found %u total peers in topology\n",
+                  total_peers);
 #endif
       GNUNET_assert (total_peers == pg->total);
       curr_state = PEER_INDEX;
@@ -3348,7 +3348,9 @@ send_core_connect_requests (void *cls,
     while (conn != NULL)
     {
       GNUNET_TRANSPORT_try_connect (send_hello_context->peer->daemon->th,
-                                    &send_hello_context->pg->peers[conn->index].daemon->id);
+                                    &send_hello_context->pg->peers[conn->
+                                                                   index].daemon->
+                                    id);
       conn = conn->next;
     }
     send_hello_context->core_connect_task =
@@ -3486,7 +3488,7 @@ core_connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer,
  */
 void
 core_init (void *cls, struct GNUNET_CORE_Handle *server,
-           struct GNUNET_PeerIdentity *my_identity)
+           struct GNUNET_PeerIdentity *my_identity)
 {
   struct SendHelloContext *send_hello_context = cls;
 
@@ -4878,7 +4880,7 @@ perform_dfs (struct GNUNET_TESTING_PeerGroup *pg, unsigned int num)
 static void
 internal_topology_callback (void *cls, const struct GNUNET_PeerIdentity *peer,
                             const struct GNUNET_ATS_Information *atsi,
-                            unsigned int atsi_count)
+                            unsigned int atsi_count)
 {
   struct CoreContext *core_ctx = cls;
   struct TopologyIterateContext *iter_ctx = core_ctx->iter_context;
@@ -5835,9 +5837,8 @@ start_peer_helper (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                                "peerStartHelper.pl", tempdir, NULL);
   GNUNET_assert (helper->proc != NULL);
 #if DEBUG_TESTING
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "starting peers with cmd ssh %s %s %s\n", arg,
-              "peerStartHelper.pl", tempdir);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "starting peers with cmd ssh %s %s %s\n",
+              arg, "peerStartHelper.pl", tempdir);
 #endif
   GNUNET_SCHEDULER_add_now (&check_peers_started, helper);
   GNUNET_free (tempdir);
@@ -6109,8 +6110,7 @@ GNUNET_TESTING_daemons_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
         fs = 0;
 #if DEBUG_TESTING
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Found file size %llu for hostkeys\n",
-                  fs);
+                  "Found file size %llu for hostkeys\n", fs);
 #endif
       if (0 != (fs % HOSTKEYFILESIZE))
       {
@@ -6784,9 +6784,8 @@ GNUNET_TESTING_daemons_start_service (struct GNUNET_TESTING_PeerGroup *pg,
   for (i = 0; i < pg->total; i++)
   {
 #if DEBUG_START
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Starting up service %s on peer %d!\n", service,
-                stopped_arr[stopped_permute[i]]);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting up service %s on peer %d!\n",
+                service, stopped_arr[stopped_permute[i]]);
 #endif
     peer_start_ctx = GNUNET_malloc (sizeof (struct PeerServiceStartContext));
     peer_start_ctx->start_ctx = start_ctx;
diff --git a/src/testing/testing_peergroup.c b/src/testing/testing_peergroup.c
index 470fdf8fa..a46e1bfb2 100644
--- a/src/testing/testing_peergroup.c
+++ b/src/testing/testing_peergroup.c
@@ -591,8 +591,8 @@ internal_hostkey_callback (void *cls, const struct GNUNET_PeerIdentity *id,
 
     GNUNET_SCHEDULER_cancel (pg_start_ctx->die_task);
     GNUNET_free_non_null (pg_start_ctx->fail_reason);
-      pg_start_ctx->fail_reason =
-          GNUNET_strdup ("from continue startup (timeout)");
+    pg_start_ctx->fail_reason =
+        GNUNET_strdup ("from continue startup (timeout)");
     pg_start_ctx->die_task =
         GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining
                                       (pg_start_ctx->timeout), &end_badly,
@@ -928,7 +928,8 @@ GNUNET_TESTING_peergroup_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
   /* Make compilers happy */
   reset_meter (pg_start_ctx->peer_start_meter);
   pg_start_ctx->fail_reason =
-        GNUNET_strdup ("didn't generate all hostkeys within allowed startup time!");
+      GNUNET_strdup
+      ("didn't generate all hostkeys within allowed startup time!");
   pg_start_ctx->die_task =
       GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining
                                     (pg_start_ctx->timeout), &end_badly,