tighten formatting rules

14 files changed, 18 insertions, 15 deletions

diff --git a/src/datastore/datastore.h b/src/datastore/datastore.h
index ee963b5ef..7af926617 100644
--- a/src/datastore/datastore.h
+++ b/src/datastore/datastore.h
@@ -254,5 +254,4 @@ struct DataMessage
 GNUNET_NETWORK_STRUCT_END
 
 
-
 #endif
diff --git a/src/datastore/datastore_api.c b/src/datastore/datastore_api.c
index b10c43944..4537f6efe 100644
--- a/src/datastore/datastore_api.c
+++ b/src/datastore/datastore_api.c
@@ -1241,7 +1241,6 @@ GNUNET_DATASTORE_remove (struct GNUNET_DATASTORE_Handle *h,
 }
 
 
-
 /**
  * Get a random value from the datastore for content replication.
  * Returns a single, random value among those with the highest
diff --git a/src/datastore/gnunet-datastore.c b/src/datastore/gnunet-datastore.c
index 259fa518b..54d087bc4 100644
--- a/src/datastore/gnunet-datastore.c
+++ b/src/datastore/gnunet-datastore.c
@@ -412,7 +412,7 @@ start_insert ()
   ssize_t len;
 
   len = GNUNET_DISK_file_read (file_handle, buf, MAGIC_LEN);
-  if ((len != MAGIC_LEN)||(0 != memcmp (buf, MAGIC_BYTES, MAGIC_LEN)))
+  if ((len != MAGIC_LEN) || (0 != memcmp (buf, MAGIC_BYTES, MAGIC_LEN)))
   {
     fprintf (stderr, _ ("Input file is not of a supported format\n"));
     return;
@@ -504,4 +504,5 @@ main (int argc, char *const *argv)
   return ret;
 }
 
+
 /* end of gnunet-datastore.c */
diff --git a/src/datastore/gnunet-service-datastore.c b/src/datastore/gnunet-service-datastore.c
index bd86fdad1..3fc46e19c 100644
--- a/src/datastore/gnunet-service-datastore.c
+++ b/src/datastore/gnunet-service-datastore.c
@@ -599,8 +599,7 @@ handle_reserve (void *cls, const struct ReserveMessage *msg)
        * message happens, the insertion request could be blocked
        * by less-important content from migration because it is
        * larger than 1/8th of the overall available space, and
-       * we only reserve 1/8th for "fresh" insertions */
-      GNUNET_log (
+       * we only reserve 1/8th for "fresh" insertions */GNUNET_log (
         GNUNET_ERROR_TYPE_WARNING,
         _ (
           "The requested amount (%llu bytes) is larger than the cache size (%llu bytes)\n"),
diff --git a/src/datastore/perf_datastore_api.c b/src/datastore/perf_datastore_api.c
index f353d0452..fef38891e 100644
--- a/src/datastore/perf_datastore_api.c
+++ b/src/datastore/perf_datastore_api.c
@@ -625,4 +625,5 @@ main (int argc,
   return ok;
 }
 
+
 /* end of perf_datastore_api.c */
diff --git a/src/datastore/perf_plugin_datastore.c b/src/datastore/perf_plugin_datastore.c
index a1604d441..d7488d4e7 100644
--- a/src/datastore/perf_plugin_datastore.c
+++ b/src/datastore/perf_plugin_datastore.c
@@ -408,7 +408,6 @@ unload_plugin (struct GNUNET_DATASTORE_PluginFunctions *api,
 }
 
 
-
 /**
  * Last task run during shutdown.  Disconnects us from
  * the transport and core.
@@ -570,4 +569,5 @@ main (int argc, char *argv[])
   return ok;
 }
 
+
 /* end of perf_plugin_datastore.c */
diff --git a/src/datastore/plugin_datastore_heap.c b/src/datastore/plugin_datastore_heap.c
index 4e48bfd4c..a827a2763 100644
--- a/src/datastore/plugin_datastore_heap.c
+++ b/src/datastore/plugin_datastore_heap.c
@@ -268,6 +268,7 @@ update_iterator (void *cls,
   return GNUNET_NO;
 }
 
+
 /**
  * Store an item in the datastore.
  *
@@ -939,4 +940,5 @@ libgnunet_plugin_datastore_heap_done (void *cls)
   return NULL;
 }
 
+
 /* end of plugin_datastore_heap.c */
diff --git a/src/datastore/plugin_datastore_mysql.c b/src/datastore/plugin_datastore_mysql.c
index 6aec09c54..15c2fe386 100644
--- a/src/datastore/plugin_datastore_mysql.c
+++ b/src/datastore/plugin_datastore_mysql.c
@@ -920,7 +920,6 @@ struct ExpiCtx
 };
 
 
-
 /**
  * Wrapper for the processor for #mysql_plugin_get_expiration().
  * If no expired value was found, we do a second query for
@@ -1200,4 +1199,5 @@ libgnunet_plugin_datastore_mysql_done (void *cls)
   return NULL;
 }
 
+
 /* end of plugin_datastore_mysql.c */
diff --git a/src/datastore/plugin_datastore_postgres.c b/src/datastore/plugin_datastore_postgres.c
index 0811edfd7..eba717226 100644
--- a/src/datastore/plugin_datastore_postgres.c
+++ b/src/datastore/plugin_datastore_postgres.c
@@ -73,8 +73,7 @@ init_connection (struct Plugin *plugin)
      * we do math or inequality tests, so we can't handle the entire range of uint32_t.
      * This will also cause problems for expiration times after 294247-01-10-04:00:54 UTC.
      * PostgreSQL also recommends against using WITH OIDS.
-     */
-    GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS gn090 ("
+     */GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS gn090 ("
                             "  repl INTEGER NOT NULL DEFAULT 0,"
                             "  type INTEGER NOT NULL DEFAULT 0,"
                             "  prio INTEGER NOT NULL DEFAULT 0,"
@@ -970,4 +969,5 @@ libgnunet_plugin_datastore_postgres_done (void *cls)
   return NULL;
 }
 
+
 /* end of plugin_datastore_postgres.c */
diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c
index b1bb7df7e..b3b30f256 100644
--- a/src/datastore/plugin_datastore_sqlite.c
+++ b/src/datastore/plugin_datastore_sqlite.c
@@ -349,8 +349,7 @@ database_setup (const struct GNUNET_CONFIGURATION_Handle *cfg,
    * we only test equality on it and can cast it to/from uint32_t. For repl, prio, and anonLevel
    * we do math or inequality tests, so we can't handle the entire range of uint32_t.
    * This will also cause problems for expiration times after 294247-01-10-04:00:54 UTC.
-   */
-  if ((SQLITE_DONE == sqlite3_step (stmt)) &&
+   */if ((SQLITE_DONE == sqlite3_step (stmt)) &&
       (SQLITE_OK != sqlite3_exec (plugin->dbh,
                                   "CREATE TABLE gn091 ("
                                   "  repl INT4 NOT NULL DEFAULT 0,"
@@ -1350,4 +1349,5 @@ libgnunet_plugin_datastore_sqlite_done (void *cls)
   return NULL;
 }
 
+
 /* end of plugin_datastore_sqlite.c */
diff --git a/src/datastore/plugin_datastore_template.c b/src/datastore/plugin_datastore_template.c
index 1f9a0f416..2b455f8cb 100644
--- a/src/datastore/plugin_datastore_template.c
+++ b/src/datastore/plugin_datastore_template.c
@@ -118,7 +118,6 @@ template_plugin_get_key (void *cls,
 }
 
 
-
 /**
  * Get a random item for replication.  Returns a single, not expired,
  * random item from those with the highest replication counters.  The
@@ -271,4 +270,5 @@ libgnunet_plugin_datastore_template_done (void *cls)
   return NULL;
 }
 
+
 /* end of plugin_datastore_template.c */
diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c
index 93ba46ff8..dbe590bab 100644
--- a/src/datastore/test_datastore_api.c
+++ b/src/datastore/test_datastore_api.c
@@ -728,4 +728,5 @@ main (int argc,
   return ok;
 }
 
+
 /* end of test_datastore_api.c */
diff --git a/src/datastore/test_datastore_api_management.c b/src/datastore/test_datastore_api_management.c
index e6bacaf6e..7bec0d064 100644
--- a/src/datastore/test_datastore_api_management.c
+++ b/src/datastore/test_datastore_api_management.c
@@ -404,4 +404,5 @@ main (int argc, char *argv[])
   return ok;
 }
 
+
 /* end of test_datastore_api_management.c */
diff --git a/src/datastore/test_plugin_datastore.c b/src/datastore/test_plugin_datastore.c
index 15fead3b7..9fe2462e7 100644
--- a/src/datastore/test_plugin_datastore.c
+++ b/src/datastore/test_plugin_datastore.c
@@ -154,8 +154,8 @@ do_put (struct CpsRunContext *crc)
   /* most content is 32k */
   size = 32 * 1024;
 
-  if ((0 != i)&&(GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 16) ==
-                 0) )                                                             /* but some of it is less! */
+  if ((0 != i) && (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 16) ==
+                   0) )                                                           /* but some of it is less! */
     size = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 32 * 1024);
   size = size - (size & 7);     /* always multiple of 8 */
 
@@ -274,7 +274,6 @@ unload_plugin (struct GNUNET_DATASTORE_PluginFunctions *api,
 }
 
 
-
 /**
  * Last task run during shutdown.  Disconnects us from
  * the transport and core.
@@ -475,4 +474,5 @@ main (int argc, char *argv[])
   return ok;
 }
 
+
 /* end of test_plugin_datastore.c */