tighten formatting rules

16 files changed, 17 insertions, 12 deletions

diff --git a/src/dht/dht.h b/src/dht/dht.h
index 052a60b99..86f1b9b49 100644
--- a/src/dht/dht.h
+++ b/src/dht/dht.h
@@ -137,7 +137,6 @@ struct GNUNET_DHT_ClientGetResultSeenMessage
 };
 
 
-
 /**
  * Reply to a GET send from the service to a client.
  */
diff --git a/src/dht/dht_test_lib.c b/src/dht/dht_test_lib.c
index e18d2ab24..0d382cd74 100644
--- a/src/dht/dht_test_lib.c
+++ b/src/dht/dht_test_lib.c
@@ -213,4 +213,5 @@ GNUNET_DHT_TEST_run (const char *testname,
                                   &dht_test_run, ctx);
 }
 
+
 /* end of dht_test_lib.c */
diff --git a/src/dht/gnunet-dht-get.c b/src/dht/gnunet-dht-get.c
index aacd4ac98..c8a1cb735 100644
--- a/src/dht/gnunet-dht-get.c
+++ b/src/dht/gnunet-dht-get.c
@@ -286,4 +286,5 @@ main (int argc, char *const *argv)
          : 1;
 }
 
+
 /* end of gnunet-dht-get.c */
diff --git a/src/dht/gnunet-dht-monitor.c b/src/dht/gnunet-dht-monitor.c
index d0cd4cff1..8dc14e223 100644
--- a/src/dht/gnunet-dht-monitor.c
+++ b/src/dht/gnunet-dht-monitor.c
@@ -284,6 +284,7 @@ run (void *cls,
                                              NULL);
 }
 
+
 /**
  * Entry point for gnunet-dht-monitor
  *
@@ -340,4 +341,5 @@ main (int argc, char *const *argv)
          : 1;
 }
 
+
 /* end of gnunet-dht-monitor.c */
diff --git a/src/dht/gnunet-dht-put.c b/src/dht/gnunet-dht-put.c
index d8bffbf37..7ee4ec185 100644
--- a/src/dht/gnunet-dht-put.c
+++ b/src/dht/gnunet-dht-put.c
@@ -168,6 +168,7 @@ run (void *cls,
                   NULL);
 }
 
+
 /**
  * Entry point for gnunet-dht-put
  *
@@ -236,4 +237,5 @@ main (int argc, char *const *argv)
          : 1;
 }
 
+
 /* end of gnunet-dht-put.c */
diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c
index 380002deb..2dd49a1b6 100644
--- a/src/dht/gnunet-service-dht.c
+++ b/src/dht/gnunet-service-dht.c
@@ -161,6 +161,4 @@ run (void *cls,
 GDS_DHT_SERVICE_INIT ("dht", &run);
 
 
-
-
 /* end of gnunet-service-dht.c */
diff --git a/src/dht/gnunet-service-dht.h b/src/dht/gnunet-service-dht.h
index 2574edc7b..6741efb4e 100644
--- a/src/dht/gnunet-service-dht.h
+++ b/src/dht/gnunet-service-dht.h
@@ -59,7 +59,6 @@ extern struct GNUNET_STATISTICS_Handle *GDS_stats;
 extern struct GNUNET_MessageHeader *GDS_my_hello;
 
 
-
 /**
  * Handle a reply we've received from another peer.  If the reply
  * matches any of our pending queries, forward it to the respective
diff --git a/src/dht/gnunet-service-dht_clients.c b/src/dht/gnunet-service-dht_clients.c
index 932b04d9b..be6e22d01 100644
--- a/src/dht/gnunet-service-dht_clients.c
+++ b/src/dht/gnunet-service-dht_clients.c
@@ -1318,7 +1318,7 @@ GDS_CLIENTS_process_get_resp (enum GNUNET_BLOCK_Type type,
   cl_size = 0;
   for (m = monitor_head; NULL != m; m = m->next)
   {
-    if (((GNUNET_BLOCK_TYPE_ANY == m->type) ||(m->type == type) ) &&
+    if (((GNUNET_BLOCK_TYPE_ANY == m->type) || (m->type == type) ) &&
         ((NULL == m->key) ||
          (memcmp (key, m->key, sizeof(struct GNUNET_HashCode)) == 0) ))
     {
@@ -1402,7 +1402,7 @@ GDS_CLIENTS_process_put (uint32_t options,
   cl_size = 0;
   for (m = monitor_head; NULL != m; m = m->next)
   {
-    if (((GNUNET_BLOCK_TYPE_ANY == m->type) ||(m->type == type) ) &&
+    if (((GNUNET_BLOCK_TYPE_ANY == m->type) || (m->type == type) ) &&
         ((NULL == m->key) ||
          (memcmp (key, m->key, sizeof(struct GNUNET_HashCode)) == 0) ))
     {
@@ -1540,4 +1540,5 @@ GDS_CLIENTS_done ()
   }
 }
 
+
 /* end of gnunet-service-dht_clients.c */
diff --git a/src/dht/gnunet-service-dht_hello.c b/src/dht/gnunet-service-dht_hello.c
index e57951ab1..a0141d1fb 100644
--- a/src/dht/gnunet-service-dht_hello.c
+++ b/src/dht/gnunet-service-dht_hello.c
@@ -144,4 +144,5 @@ GDS_HELLO_done ()
   }
 }
 
+
 /* end of gnunet-service-dht_hello.c */
diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c
index fe9dd3e9c..c251dfa12 100644
--- a/src/dht/gnunet-service-dht_neighbours.c
+++ b/src/dht/gnunet-service-dht_neighbours.c
@@ -907,11 +907,8 @@ get_distance (const struct GNUNET_HashCode *target,
    * use the highest 2^9 bits of the result to signify the
    * number of (mis)matching LSB bits; if we have 0 matching
    * and hence 512 mismatching LSB bits we return -1 (since
-   * 512 itself cannot be represented with 9 bits) */
-
-  /* first, calculate the most significant 9 bits of our
-   * result, aka the number of LSBs */
-  bucket = GNUNET_CRYPTO_hash_matching_bits (target,
+   * 512 itself cannot be represented with 9 bits) *//* first, calculate the most significant 9 bits of our
+   * result, aka the number of LSBs */bucket = GNUNET_CRYPTO_hash_matching_bits (target,
                                              have);
   /* bucket is now a value between 0 and 512 */
   if (bucket == 512)
diff --git a/src/dht/gnunet-service-dht_neighbours.h b/src/dht/gnunet-service-dht_neighbours.h
index cdcf30b01..55cc5b135 100644
--- a/src/dht/gnunet-service-dht_neighbours.h
+++ b/src/dht/gnunet-service-dht_neighbours.h
@@ -143,7 +143,6 @@ GDS_am_closest_peer (const struct GNUNET_HashCode *key,
                      const struct GNUNET_CONTAINER_BloomFilter *bloom);
 
 
-
 /**
  * Initialize neighbours subsystem.
  *
diff --git a/src/dht/gnunet-service-dht_nse.c b/src/dht/gnunet-service-dht_nse.c
index 89107be16..7f411cf71 100644
--- a/src/dht/gnunet-service-dht_nse.c
+++ b/src/dht/gnunet-service-dht_nse.c
@@ -113,4 +113,5 @@ GDS_NSE_done ()
   }
 }
 
+
 /* end of gnunet-service-dht_nse.c */
diff --git a/src/dht/gnunet-service-dht_routing.c b/src/dht/gnunet-service-dht_routing.c
index 3454c1acb..75513f833 100644
--- a/src/dht/gnunet-service-dht_routing.c
+++ b/src/dht/gnunet-service-dht_routing.c
@@ -484,4 +484,5 @@ GDS_ROUTING_done ()
   recent_map = NULL;
 }
 
+
 /* end of gnunet-service-dht_routing.c */
diff --git a/src/dht/plugin_block_dht.c b/src/dht/plugin_block_dht.c
index 084384146..f213433ed 100644
--- a/src/dht/plugin_block_dht.c
+++ b/src/dht/plugin_block_dht.c
@@ -247,4 +247,5 @@ libgnunet_plugin_block_dht_done (void *cls)
   return NULL;
 }
 
+
 /* end of plugin_block_dht.c */
diff --git a/src/dht/test_dht_api.c b/src/dht/test_dht_api.c
index a62ee9668..957c71d7f 100644
--- a/src/dht/test_dht_api.c
+++ b/src/dht/test_dht_api.c
@@ -189,4 +189,5 @@ main (int argc,
   return ok;
 }
 
+
 /* end of test_dht_api.c */
diff --git a/src/dht/test_dht_topo.c b/src/dht/test_dht_topo.c
index d92095cc6..7f737ea03 100644
--- a/src/dht/test_dht_topo.c
+++ b/src/dht/test_dht_topo.c
@@ -528,4 +528,5 @@ main (int xargc, char *xargv[])
   return ok;
 }
 
+
 /* end of test_dht_topo.c */