tighten formatting rules

9 files changed, 42 insertions, 20 deletions

diff --git a/src/ats-tests/ats-testing-experiment.c b/src/ats-tests/ats-testing-experiment.c
index 676021926..fa379200f 100644
--- a/src/ats-tests/ats-testing-experiment.c
+++ b/src/ats-tests/ats-testing-experiment.c
@@ -65,6 +65,7 @@ create_experiment ()
   return e;
 }
 
+
 static void
 free_experiment (struct Experiment *e)
 {
@@ -509,6 +510,7 @@ enforce_start_send (struct GNUNET_ATS_TEST_Operation *op)
                                                         GNUNET_TIME_UNIT_FOREVER_REL);
 }
 
+
 static void
 enforce_stop_send (struct GNUNET_ATS_TEST_Operation *op)
 {
@@ -572,6 +574,7 @@ enforce_start_preference (struct GNUNET_ATS_TEST_Operation *op)
                                                             op->pref_type);
 }
 
+
 static void
 enforce_stop_preference (struct GNUNET_ATS_TEST_Operation *op)
 {
@@ -595,7 +598,9 @@ enforce_stop_preference (struct GNUNET_ATS_TEST_Operation *op)
   }
 }
 
-static void enforce_episode (struct Episode *ep)
+
+static void
+enforce_episode (struct Episode *ep)
 {
   struct GNUNET_ATS_TEST_Operation *cur;
 
@@ -794,6 +799,7 @@ GNUNET_ATS_TEST_experimentation_load (const char *filename)
   return e;
 }
 
+
 void
 GNUNET_ATS_TEST_experimentation_stop (struct Experiment *e)
 {
@@ -810,4 +816,5 @@ GNUNET_ATS_TEST_experimentation_stop (struct Experiment *e)
   free_experiment (e);
 }
 
+
 /* end of file ats-testing-experiment.c*/
diff --git a/src/ats-tests/ats-testing-log.c b/src/ats-tests/ats-testing-log.c
index 12a08ffda..38094a438 100644
--- a/src/ats-tests/ats-testing-log.c
+++ b/src/ats-tests/ats-testing-log.c
@@ -246,7 +246,6 @@ struct LoggingHandle
 };
 
 
-
 static void
 write_throughput_gnuplot_script (char *fn, struct LoggingPeer *lp, char **fs,
                                  int slaves)
@@ -380,6 +379,7 @@ write_rtt_gnuplot_script (char *fn, struct LoggingPeer *lp, char **fs, int
   GNUNET_free (gfn);
 }
 
+
 static void
 write_bw_gnuplot_script (char *fn, struct LoggingPeer *lp, char **fs, int
                          slaves)
@@ -664,6 +664,7 @@ GNUNET_ATS_TEST_logging_write_to_file (struct LoggingHandle *l,
   GNUNET_free (filename_master);
 }
 
+
 /**
  * Log all data now
  *
@@ -895,6 +896,7 @@ GNUNET_ATS_TEST_logging_stop (struct LoggingHandle *l)
               _ ("Stop logging\n"));
 }
 
+
 /**
  * Clean up logging data
  *
@@ -969,4 +971,6 @@ GNUNET_ATS_TEST_logging_start (struct GNUNET_TIME_Relative log_frequency,
 
   return l;
 }
+
+
 /* end of file ats-testing-log.c */
diff --git a/src/ats-tests/ats-testing-preferences.c b/src/ats-tests/ats-testing-preferences.c
index 8138b18bb..f30fde960 100644
--- a/src/ats-tests/ats-testing-preferences.c
+++ b/src/ats-tests/ats-testing-preferences.c
@@ -261,4 +261,5 @@ GNUNET_ATS_TEST_generate_preferences_stop_all ()
   }
 }
 
+
 /* end of file ats-testing-preferences.c */
diff --git a/src/ats-tests/ats-testing-traffic.c b/src/ats-tests/ats-testing-traffic.c
index 14a8fe327..f19eac871 100644
--- a/src/ats-tests/ats-testing-traffic.c
+++ b/src/ats-tests/ats-testing-traffic.c
@@ -389,4 +389,5 @@ GNUNET_ATS_TEST_generate_traffic_stop_all ()
   }
 }
 
+
 /* end of file ats-testing-traffic.c */
diff --git a/src/ats-tests/ats-testing.c b/src/ats-tests/ats-testing.c
index 88c1729a6..c7969cdfe 100644
--- a/src/ats-tests/ats-testing.c
+++ b/src/ats-tests/ats-testing.c
@@ -738,7 +738,6 @@ do_connect_ats (void *cls)
 }
 
 
-
 static void
 peerinformation_cb (void *cb_cls,
                     struct GNUNET_TESTBED_Operation *op,
diff --git a/src/ats-tests/gnunet-ats-sim.c b/src/ats-tests/gnunet-ats-sim.c
index c9e7a6d9f..fb3014798 100644
--- a/src/ats-tests/gnunet-ats-sim.c
+++ b/src/ats-tests/gnunet-ats-sim.c
@@ -252,22 +252,19 @@ topology_setup_done (void *cls,
       GNUNET_ATS_TEST_TG_CONSTANT, 1, 1, GNUNET_TIME_UNIT_SECONDS,
       GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 250),
       GNUNET_ATS_PREFERENCE_BANDWIDTH);
- */
-/*
+ *//*
    GNUNET_ATS_TEST_generate_preferences_start(&masters[0],&masters[0].partners[0],
       GNUNET_ATS_TEST_TG_LINEAR, 1, 50,
       GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 2),
       GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 250),
       GNUNET_ATS_PREFERENCE_BANDWIDTH);
- */
-/*
+ *//*
    GNUNET_ATS_TEST_generate_preferences_start(&masters[0],&masters[0].partners[0],
         GNUNET_ATS_TEST_TG_RANDOM, 1, 50,
         GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 2),
         GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 250),
         GNUNET_ATS_PREFERENCE_BANDWIDTH);
- */
-/*
+ *//*
    GNUNET_ATS_TEST_generate_preferences_start(&masters[0],&masters[0].partners[0],
       GNUNET_ATS_TEST_TG_SINUS, 10, 5,
       GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 5),
@@ -397,4 +394,6 @@ main (int argc, char *argv[])
   GNUNET_free (opt_exp_file);
   return 0;
 }
+
+
 /* end of file gnunet-ats-sim.c */
diff --git a/src/ats-tests/gnunet-solver-eval.c b/src/ats-tests/gnunet-solver-eval.c
index bc6a3c435..09ddd7b2d 100644
--- a/src/ats-tests/gnunet-solver-eval.c
+++ b/src/ats-tests/gnunet-solver-eval.c
@@ -408,6 +408,7 @@ load_episode (struct Experiment *e,
   return GNUNET_OK;
 }
 
+
 static int
 load_episodes (struct Experiment *e, struct GNUNET_CONFIGURATION_Handle *cfg)
 {
@@ -517,8 +518,8 @@ enforce_start_send (struct GNUNET_ATS_TEST_Operation *op)
      partner->tg = GNUNET_ATS_TEST_generate_traffic_start(peer, partner,
       op->tg_type, op->base_rate, op->max_rate, op->period,
       GNUNET_TIME_UNIT_FOREVER_REL);
-   */
-}
+   */}
+
 
 static void
 enforce_stop_send (struct GNUNET_ATS_TEST_Operation *op)
@@ -541,8 +542,7 @@ enforce_stop_send (struct GNUNET_ATS_TEST_Operation *op)
      GNUNET_ATS_TEST_generate_traffic_stop(p->tg);
      p->tg = NULL;
      }
-   */
-}
+   */}
 
 
 static void
@@ -579,8 +579,8 @@ enforce_start_preference (struct GNUNET_ATS_TEST_Operation *op)
      partner->pg = GNUNET_ATS_TEST_generate_preferences_start(peer, partner,
       op->tg_type, op->base_rate, op->max_rate, op->period, op->frequency,
       op->pref_type);
-   */
-}
+   */}
+
 
 static void
 enforce_stop_preference (struct GNUNET_ATS_TEST_Operation *op)
@@ -603,10 +603,11 @@ enforce_stop_preference (struct GNUNET_ATS_TEST_Operation *op)
      GNUNET_ATS_TEST_generate_preferences_stop (p->pg);
      p->pg = NULL;
      }
-   */
-}
+   */}
+
 
-static void enforce_episode (struct Episode *ep)
+static void
+enforce_episode (struct Episode *ep)
 {
   struct GNUNET_ATS_TEST_Operation *cur;
 
@@ -805,6 +806,7 @@ GNUNET_ATS_solvers_experimentation_load (char *filename)
   return e;
 }
 
+
 void
 GNUNET_ATS_solvers_experimentation_stop (struct Experiment *e)
 {
@@ -821,6 +823,7 @@ GNUNET_ATS_solvers_experimentation_stop (struct Experiment *e)
   free_experiment (e);
 }
 
+
 /**
  * Solver
  */
@@ -847,6 +850,7 @@ GNUNET_ATS_solvers_solver_stop (struct GNUNET_ATS_TESTING_SolverHandle *sh)
   GNUNET_free (sh);
 }
 
+
 struct GNUNET_ATS_TESTING_SolverHandle *
 GNUNET_ATS_solvers_solver_start (enum GNUNET_ATS_Solvers type)
 {
@@ -885,6 +889,7 @@ GNUNET_ATS_solvers_solver_start (enum GNUNET_ATS_Solvers type)
   return sh;
 }
 
+
 static struct Experiment *e;
 
 static struct GNUNET_ATS_TESTING_SolverHandle *sh;
@@ -1015,4 +1020,6 @@ main (int argc, char *argv[])
 
   return 0;
 }
+
+
 /* end of file gnunet-solver-eval.c*/
diff --git a/src/ats-tests/perf_ats.c b/src/ats-tests/perf_ats.c
index 470c687fc..64756b8aa 100644
--- a/src/ats-tests/perf_ats.c
+++ b/src/ats-tests/perf_ats.c
@@ -420,7 +420,7 @@ main (int argc, char *argv[])
   /* Determine solver name */
   solver = GNUNET_strdup (tmp);
   /* Remove .exe prefix */
-  if ((NULL != (dotexe = strstr (solver, ".exe")))&&(dotexe[4] == '\0'))
+  if ((NULL != (dotexe = strstr (solver, ".exe"))) && (dotexe[4] == '\0'))
     dotexe[0] = '\0';
 
   /* Determine first '_' after solver */
@@ -597,4 +597,5 @@ main (int argc, char *argv[])
   return result;
 }
 
+
 /* end of file perf_ats.c */
diff --git a/src/ats-tests/perf_ats_logging.c b/src/ats-tests/perf_ats_logging.c
index 41c50ea6e..ac8fa8950 100644
--- a/src/ats-tests/perf_ats_logging.c
+++ b/src/ats-tests/perf_ats_logging.c
@@ -372,6 +372,7 @@ write_rtt_gnuplot_script (char *fn, struct LoggingPeer *lp)
   GNUNET_free (gfn);
 }
 
+
 static void
 write_bw_gnuplot_script (char *fn, struct LoggingPeer *lp)
 {
@@ -514,7 +515,6 @@ write_to_file ()
       /* Assembling master string */
 
 
-
       GNUNET_asprintf (&data, "%llu;%llu;%u;%u;%u;%u;%u;%u;;;;;;;;;;;%s\n",
                        cur_lt->timestamp,
                        GNUNET_TIME_absolute_get_difference (lp[c_m].start,
@@ -703,6 +703,7 @@ collect_log_now (void)
   }
 }
 
+
 static void
 collect_log_task (void *cls)
 {
@@ -774,4 +775,6 @@ perf_logging_start (struct GNUNET_TIME_Relative log_frequency,
   log_task = GNUNET_SCHEDULER_add_now (&collect_log_task, NULL);
   running = GNUNET_YES;
 }
+
+
 /* end of file perf_ats_logging.c */