tighten formatting rules

36 files changed, 45 insertions, 26 deletions

diff --git a/src/testbed/gnunet-daemon-latency-logger.c b/src/testbed/gnunet-daemon-latency-logger.c
index c35282048..be6efaedf 100644
--- a/src/testbed/gnunet-daemon-latency-logger.c
+++ b/src/testbed/gnunet-daemon-latency-logger.c
@@ -150,6 +150,7 @@ do_shutdown (void *cls)
   }
 }
 
+
 /**
  * Signature of a function that is called with QoS information about an address.
  *
diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c
index f7d089d93..4c1637db6 100644
--- a/src/testbed/gnunet-helper-testbed.c
+++ b/src/testbed/gnunet-helper-testbed.c
@@ -616,4 +616,5 @@ main (int argc, char **argv)
   return (GNUNET_OK == status) ? 0 : 1;
 }
 
+
 /* end of gnunet-helper-testbed.c */
diff --git a/src/testbed/gnunet-service-test-barriers.c b/src/testbed/gnunet-service-test-barriers.c
index b28f343a1..c6c42cd1f 100644
--- a/src/testbed/gnunet-service-test-barriers.c
+++ b/src/testbed/gnunet-service-test-barriers.c
@@ -130,7 +130,6 @@ run (void *cls,
 }
 
 
-
 /**
  * Main
  */
diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c
index b34550339..21a9d0a51 100644
--- a/src/testbed/gnunet-service-testbed.c
+++ b/src/testbed/gnunet-service-testbed.c
@@ -836,8 +836,7 @@ client_disconnect_cb (void *cls,
      * from stdin, but if stdin fails for some reason, this shouldn't
      * hurt for now --- might need to revise this later if we ever
      * decide that master connections might be temporarily down
-     * for some reason */
-    // GNUNET_SCHEDULER_shutdown ();
+     * for some reason */// GNUNET_SCHEDULER_shutdown ();
   }
 }
 
diff --git a/src/testbed/gnunet-service-testbed.h b/src/testbed/gnunet-service-testbed.h
index 032dd54ed..03955327c 100644
--- a/src/testbed/gnunet-service-testbed.h
+++ b/src/testbed/gnunet-service-testbed.h
@@ -757,8 +757,6 @@ handle_manage_peer_service (void *cls,
                             GNUNET_TESTBED_ManagePeerServiceMessage *msg);
 
 
-
-
 /**
  * Check #GNUNET_MESSAGE_TYPDE_TESTBED_RECONFIGURE_PEER type messages.
  *
diff --git a/src/testbed/gnunet-service-testbed_barriers.c b/src/testbed/gnunet-service-testbed_barriers.c
index 7ea1df662..ac89abc88 100644
--- a/src/testbed/gnunet-service-testbed_barriers.c
+++ b/src/testbed/gnunet-service-testbed_barriers.c
@@ -616,7 +616,6 @@ fwd_tout_barrier_init (void *cls)
 }
 
 
-
 /**
  * Check #GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_INIT messages.
  *
@@ -923,4 +922,5 @@ handle_barrier_status (void *cls,
   }
 }
 
+
 /* end of gnunet-service-testbed_barriers.c */
diff --git a/src/testbed/gnunet-service-testbed_cache.c b/src/testbed/gnunet-service-testbed_cache.c
index 4afa06645..f87f39067 100644
--- a/src/testbed/gnunet-service-testbed_cache.c
+++ b/src/testbed/gnunet-service-testbed_cache.c
@@ -265,4 +265,5 @@ GST_cache_add_hello (const unsigned int peer_id,
   entry->hello = GNUNET_copy_message (hello);
 }
 
+
 /* end of gnunet-service-testbed_hc.c */
diff --git a/src/testbed/gnunet-service-testbed_cpustatus.c b/src/testbed/gnunet-service-testbed_cpustatus.c
index ae6450176..f38b9aee6 100644
--- a/src/testbed/gnunet-service-testbed_cpustatus.c
+++ b/src/testbed/gnunet-service-testbed_cpustatus.c
@@ -118,6 +118,8 @@ initMachCpuStats ()
                  (vm_size_t) (cpu_msg_count * sizeof(*cpu_load)));
   return GNUNET_OK;
 }
+
+
 #endif
 
 /**
@@ -464,6 +466,7 @@ updateAgedLoad ()
   }
 }
 
+
 /**
  * Get the load of the CPU relative to what is allowed.
  * @return the CPU load as a percentage of allowed
@@ -489,6 +492,7 @@ disk_get_load ()
   return (int) agedIOLoad;
 }
 
+
 /**
  * Get the percentage of memory used
  *
@@ -531,6 +535,8 @@ get_nproc ()
   closedir (dir);
   return nproc;
 }
+
+
 #endif
 
 
@@ -654,4 +660,5 @@ GST_stats_destroy ()
   bw = NULL;
 }
 
+
 /* end of cpustatus.c */
diff --git a/src/testbed/gnunet-service-testbed_meminfo.c b/src/testbed/gnunet-service-testbed_meminfo.c
index 5afce288b..1a513db6c 100644
--- a/src/testbed/gnunet-service-testbed_meminfo.c
+++ b/src/testbed/gnunet-service-testbed_meminfo.c
@@ -102,13 +102,15 @@ typedef struct mem_table_struct
   unsigned long *slot; /* slot in return struct */
 } mem_table_struct;
 
-static int compare_mem_table_structs (const void *a, const void *b)
+static int
+compare_mem_table_structs (const void *a, const void *b)
 {
   return strcmp (((const mem_table_struct*) a)->name, ((const
                                                         mem_table_struct*) b)->
                  name);
 }
 
+
 /* example data, following junk, with comments added:
  *
  * MemTotal:        61768 kB    old
@@ -186,7 +188,8 @@ static unsigned long kb_nfs_unstable;
 static unsigned long kb_swap_reclaimable;
 static unsigned long kb_swap_unreclaimable;
 
-void meminfo (void)
+void
+meminfo (void)
 {
   char namebuf[16]; /* big enough to hold any row name */
   mem_table_struct findme = { namebuf, NULL };
diff --git a/src/testbed/gnunet-service-testbed_oc.c b/src/testbed/gnunet-service-testbed_oc.c
index 817a8b2fc..262fcfc00 100644
--- a/src/testbed/gnunet-service-testbed_oc.c
+++ b/src/testbed/gnunet-service-testbed_oc.c
@@ -515,6 +515,7 @@ cleanup_occ_rp2c (struct RemotePeer2Context *rp2c)
   }
 }
 
+
 /**
  * Condition for checking if given peer is ready to be destroyed
  *
@@ -645,8 +646,6 @@ GST_notify_client_disconnect_oc (struct GNUNET_SERVICE_Client *client)
 }
 
 
-
-
 /**
  * FIXME.
  */
diff --git a/src/testbed/gnunet-service-testbed_peers.c b/src/testbed/gnunet-service-testbed_peers.c
index 836f05464..d3d597d4f 100644
--- a/src/testbed/gnunet-service-testbed_peers.c
+++ b/src/testbed/gnunet-service-testbed_peers.c
@@ -148,7 +148,6 @@ static struct PeerReconfigureContext *prc_head;
 static struct PeerReconfigureContext *prc_tail;
 
 
-
 /**
  * DLL head for queue of manage service requests
  */
diff --git a/src/testbed/test_gnunet_helper_testbed.c b/src/testbed/test_gnunet_helper_testbed.c
index caf33c71b..7c4d4bad5 100644
--- a/src/testbed/test_gnunet_helper_testbed.c
+++ b/src/testbed/test_gnunet_helper_testbed.c
@@ -251,4 +251,5 @@ main (int argc, char **argv)
   return (GNUNET_OK == result) ? 0 : 1;
 }
 
+
 /* end of test_gnunet_helper_testbed.c */
diff --git a/src/testbed/test_testbed_api.c b/src/testbed/test_testbed_api.c
index ad71aa35e..dd270df17 100644
--- a/src/testbed/test_testbed_api.c
+++ b/src/testbed/test_testbed_api.c
@@ -262,7 +262,6 @@ service_connect_comp_cb (void *cls,
 }
 
 
-
 /**
  * Callback to be called when the requested peer information is available
  *
@@ -460,7 +459,6 @@ status_cb (void *cls,
 }
 
 
-
 /**
  * Main run function.
  *
@@ -513,4 +511,5 @@ main (int argc, char **argv)
   return 0;
 }
 
+
 /* end of test_testbed_api.c */
diff --git a/src/testbed/test_testbed_api_2peers_1controller.c b/src/testbed/test_testbed_api_2peers_1controller.c
index de56ec88a..c854d1ccc 100644
--- a/src/testbed/test_testbed_api_2peers_1controller.c
+++ b/src/testbed/test_testbed_api_2peers_1controller.c
@@ -487,7 +487,6 @@ status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg_, int
 }
 
 
-
 /**
  * Main run function.
  *
@@ -537,4 +536,5 @@ main (int argc, char **argv)
   return 0;
 }
 
+
 /* end of test_testbed_api_2peers_1controller.c */
diff --git a/src/testbed/test_testbed_api_3peers_3controllers.c b/src/testbed/test_testbed_api_3peers_3controllers.c
index 1de635fd9..bf9011941 100644
--- a/src/testbed/test_testbed_api_3peers_3controllers.c
+++ b/src/testbed/test_testbed_api_3peers_3controllers.c
@@ -960,4 +960,5 @@ main (int argc, char **argv)
   }
 }
 
+
 /* end of test_testbed_api_3peers_3controllers.c */
diff --git a/src/testbed/test_testbed_api_controllerlink.c b/src/testbed/test_testbed_api_controllerlink.c
index 55ec184ea..16a3f7b91 100644
--- a/src/testbed/test_testbed_api_controllerlink.c
+++ b/src/testbed/test_testbed_api_controllerlink.c
@@ -725,6 +725,7 @@ registration_cont (void *cls, const char *emsg)
   }
 }
 
+
 /**
  * Callback to signal successfull startup of the controller process
  *
@@ -876,4 +877,5 @@ main (int argc, char **argv)
   }
 }
 
+
 /* end of test_testbed_api_controllerlink.c */
diff --git a/src/testbed/test_testbed_api_hosts.c b/src/testbed/test_testbed_api_hosts.c
index 9c2a96fb7..9e49debf7 100644
--- a/src/testbed/test_testbed_api_hosts.c
+++ b/src/testbed/test_testbed_api_hosts.c
@@ -179,4 +179,5 @@ main (int argc, char **argv)
   return (GNUNET_OK == status) ? 0 : 1;
 }
 
+
 /* end of test_testbed_api_hosts.c */
diff --git a/src/testbed/test_testbed_api_operations.c b/src/testbed/test_testbed_api_operations.c
index 832a42576..aed213d49 100644
--- a/src/testbed/test_testbed_api_operations.c
+++ b/src/testbed/test_testbed_api_operations.c
@@ -564,4 +564,5 @@ main (int argc, char **argv)
   return 0;
 }
 
+
 /* end of test_testbed_api_operations.c */
diff --git a/src/testbed/test_testbed_api_sd.c b/src/testbed/test_testbed_api_sd.c
index f7c60ea4d..816f8e9a6 100644
--- a/src/testbed/test_testbed_api_sd.c
+++ b/src/testbed/test_testbed_api_sd.c
@@ -107,4 +107,5 @@ main (int argc, char **argv)
   return ret;
 }
 
+
 /* end of test_testbed_api_sd.c */
diff --git a/src/testbed/test_testbed_api_test.c b/src/testbed/test_testbed_api_test.c
index f0d8d1d25..d3fec78d9 100644
--- a/src/testbed/test_testbed_api_test.c
+++ b/src/testbed/test_testbed_api_test.c
@@ -82,6 +82,7 @@ do_shutdown (void *cls)
   GNUNET_SCHEDULER_shutdown ();
 }
 
+
 /**
  * shortcut to exit during failure
  */
@@ -246,4 +247,5 @@ main (int argc, char **argv)
   return 0;
 }
 
+
 /* end of test_testbed_api_test.c */
diff --git a/src/testbed/test_testbed_api_test_timeout.c b/src/testbed/test_testbed_api_test_timeout.c
index 65cda0b33..d2f73df14 100644
--- a/src/testbed/test_testbed_api_test_timeout.c
+++ b/src/testbed/test_testbed_api_test_timeout.c
@@ -122,4 +122,5 @@ main (int argc, char **argv)
   return 0;
 }
 
+
 /* end of test_testbed_api_test.c */
diff --git a/src/testbed/test_testbed_api_testbed_run.c b/src/testbed/test_testbed_api_testbed_run.c
index 66f857222..fda5c3223 100644
--- a/src/testbed/test_testbed_api_testbed_run.c
+++ b/src/testbed/test_testbed_api_testbed_run.c
@@ -238,4 +238,5 @@ main (int argc, char **argv)
   return 0;
 }
 
+
 /* end of test_testbed_api_testbed_run.c */
diff --git a/src/testbed/test_testbed_api_topology.c b/src/testbed/test_testbed_api_topology.c
index 1fa13bf4f..dada7286f 100644
--- a/src/testbed/test_testbed_api_topology.c
+++ b/src/testbed/test_testbed_api_topology.c
@@ -76,6 +76,7 @@ do_shutdown (void *cls)
   GNUNET_SCHEDULER_shutdown ();
 }
 
+
 /**
  * Controller event callback
  *
@@ -184,4 +185,5 @@ main (int argc, char **argv)
   return 0;
 }
 
+
 /* end of test_testbed_api_topology.c */
diff --git a/src/testbed/test_testbed_api_topology_clique.c b/src/testbed/test_testbed_api_topology_clique.c
index 33569a2b9..33c21a69c 100644
--- a/src/testbed/test_testbed_api_topology_clique.c
+++ b/src/testbed/test_testbed_api_topology_clique.c
@@ -76,6 +76,7 @@ do_shutdown (void *cls)
   GNUNET_SCHEDULER_shutdown ();
 }
 
+
 /**
  * Controller event callback
  *
@@ -180,4 +181,5 @@ main (int argc, char **argv)
   return 0;
 }
 
+
 /* end of test_testbed_api_topology.c */
diff --git a/src/testbed/test_testbed_underlay.c b/src/testbed/test_testbed_underlay.c
index e0434379b..8b706ff83 100644
--- a/src/testbed/test_testbed_underlay.c
+++ b/src/testbed/test_testbed_underlay.c
@@ -86,7 +86,6 @@ overlay_connect_status (void *cls,
 }
 
 
-
 /**
  * Signature of a main function for a testcase.
  *
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index 38913509b..9fe5bccdc 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -1320,8 +1320,7 @@ cleanup:
    * required at the chained testbed controller setup to ensure the only the
    * test-driver echos the status and the controller hierarchy properly
    * propagates the status.
-   */
-  if ((NULL != barrier) && (GNUNET_YES == barrier->echo))
+   */if ((NULL != barrier) && (GNUNET_YES == barrier->echo))
     GNUNET_TESTBED_barrier_remove_ (barrier);
 }
 
diff --git a/src/testbed/testbed_api.h b/src/testbed/testbed_api.h
index 023d772a0..17cd38df3 100644
--- a/src/testbed/testbed_api.h
+++ b/src/testbed/testbed_api.h
@@ -105,7 +105,6 @@ enum OperationType
 };
 
 
-
 /**
  * Enumeration of states of OperationContext
  */
@@ -309,7 +308,6 @@ struct GNUNET_TESTBED_Barrier
 };
 
 
-
 /**
  * Queues a message in send queue for sending to the service
  *
@@ -484,7 +482,6 @@ GNUNET_TESTBED_get_slave_config_ (void *op_cls,
                                   uint32_t slave_host_id);
 
 
-
 /**
  * Initialise a barrier and call the given callback when the required percentage
  * of peers (quorum) reach the barrier OR upon error.
@@ -520,6 +517,5 @@ void
 GNUNET_TESTBED_barrier_remove_ (struct GNUNET_TESTBED_Barrier *barrier);
 
 
-
 #endif
 /* end of testbed_api.h */
diff --git a/src/testbed/testbed_api_barriers.c b/src/testbed/testbed_api_barriers.c
index 988fa7a1e..61578c1e6 100644
--- a/src/testbed/testbed_api_barriers.c
+++ b/src/testbed/testbed_api_barriers.c
@@ -72,7 +72,6 @@ struct GNUNET_TESTBED_BarrierWaitHandle
 };
 
 
-
 /**
  * Check if barrier status message is well-formed.
  *
@@ -261,4 +260,5 @@ GNUNET_TESTBED_barrier_wait_cancel (struct GNUNET_TESTBED_BarrierWaitHandle *h)
   GNUNET_free (h);
 }
 
+
 /* end of testbed_api_barriers.c */
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c
index fdff952a0..95463e44d 100644
--- a/src/testbed/testbed_api_hosts.c
+++ b/src/testbed/testbed_api_hosts.c
@@ -1570,4 +1570,5 @@ GNUNET_TESTBED_host_resolve_ (struct GNUNET_TESTBED_Host *host)
   host->hostname = GNUNET_strdup (host->hostname);
 }
 
+
 /* end of testbed_api_hosts.c */
diff --git a/src/testbed/testbed_api_operations.c b/src/testbed/testbed_api_operations.c
index 185f62aa8..a406c0e0b 100644
--- a/src/testbed/testbed_api_operations.c
+++ b/src/testbed/testbed_api_operations.c
@@ -746,7 +746,6 @@ merge_ops (struct GNUNET_TESTBED_Operation ***old,
 }
 
 
-
 /**
  * Checks for the readiness of an operation and schedules a operation start task
  *
@@ -1383,4 +1382,6 @@ GNUNET_TESTBED_operations_fini ()
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 "Be disciplined.  Some operations were not marked as done.\n");
 }
+
+
 /* end of testbed_api_operations.c */
diff --git a/src/testbed/testbed_api_peers.c b/src/testbed/testbed_api_peers.c
index 8d74d956f..7bd895871 100644
--- a/src/testbed/testbed_api_peers.c
+++ b/src/testbed/testbed_api_peers.c
@@ -85,7 +85,6 @@ GNUNET_TESTBED_cleanup_peers_ (void)
 }
 
 
-
 /**
  * Function to call to start a peer_create type operation once all
  * queues the operation is part of declare that the
@@ -1014,5 +1013,4 @@ GNUNET_TESTBED_peer_manage_service (void *op_cls,
 }
 
 
-
 /* end of testbed_api_peers.c */
diff --git a/src/testbed/testbed_api_sd.c b/src/testbed/testbed_api_sd.c
index 9a40464d7..59c7a3ebd 100644
--- a/src/testbed/testbed_api_sd.c
+++ b/src/testbed/testbed_api_sd.c
@@ -209,4 +209,5 @@ GNUNET_TESTBED_SD_deviation_factor_ (struct SDHandle *h, unsigned int amount,
   return GNUNET_OK;
 }
 
+
 /* end of testbed_api_sd.c */
diff --git a/src/testbed/testbed_api_services.c b/src/testbed/testbed_api_services.c
index 692fe505f..2c9a90fd4 100644
--- a/src/testbed/testbed_api_services.c
+++ b/src/testbed/testbed_api_services.c
@@ -287,4 +287,5 @@ GNUNET_TESTBED_service_connect (void *op_cls, struct GNUNET_TESTBED_Peer *peer,
   return data->operation;
 }
 
+
 /* end of testbed_api_services.c */
diff --git a/src/testbed/testbed_api_test.c b/src/testbed/testbed_api_test.c
index 5b57826ba..6179a23ef 100644
--- a/src/testbed/testbed_api_test.c
+++ b/src/testbed/testbed_api_test.c
@@ -159,4 +159,5 @@ GNUNET_TESTBED_test_run (const char *testname,
   return ret;
 }
 
+
 /* end of testbed_api_test.c */
diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c
index 3c56dd024..7be8054ca 100644
--- a/src/testbed/testbed_api_testbed.c
+++ b/src/testbed/testbed_api_testbed.c
@@ -446,6 +446,7 @@ remove_rcop (struct GNUNET_TESTBED_RunHandle *rc, struct
                                                          rcop));
 }
 
+
 /**
  * Assuming all peers have been destroyed cleanup run handle
  *
diff --git a/src/testbed/testbed_api_topology.c b/src/testbed/testbed_api_topology.c
index 191dbab66..9ffe7f47d 100644
--- a/src/testbed/testbed_api_topology.c
+++ b/src/testbed/testbed_api_topology.c
@@ -407,7 +407,6 @@ overlay_link_completed (void *cls,
 }
 
 
-
 /**
  * Function called when a overlay connect operation is ready
  *
@@ -1658,4 +1657,5 @@ GNUNET_TESTBED_underlay_construct_ (int num_peers,
   return ret;
 }
 
+
 /* end of testbed_api_topology.c */