tighten formatting rules

87 files changed, 227 insertions, 74 deletions

diff --git a/src/util/client.c b/src/util/client.c
index d431909cf..024f34b3a 100644
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -45,7 +45,6 @@
     GNUNET_TIME_UNIT_SECONDS, 5)
 
 
-
 /**
  * Internal state for a client connected to a GNUnet service.
  */
@@ -1109,4 +1108,5 @@ GNUNET_CLIENT_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
   return cstate->mq;
 }
 
+
 /* end of client.c */
diff --git a/src/util/common_allocation.c b/src/util/common_allocation.c
index 358c09808..137af7b85 100644
--- a/src/util/common_allocation.c
+++ b/src/util/common_allocation.c
@@ -361,6 +361,8 @@ strnlen (const char *s, size_t n)
     return n;
   return e - s;
 }
+
+
 #endif
 
 
diff --git a/src/util/common_logging.c b/src/util/common_logging.c
index 3ff9bf18e..d13f3a7fa 100644
--- a/src/util/common_logging.c
+++ b/src/util/common_logging.c
@@ -401,6 +401,8 @@ setup_log_file (const struct tm *tm)
   GNUNET_stderr = altlog;
   return GNUNET_OK;
 }
+
+
 #endif
 
 
@@ -504,7 +506,7 @@ GNUNET_get_log_call_status (int caller_level,
   {
     ld = &logdefs[i];
     if (((! force_only) || ld->force) &&
-        ((line >= ld->from_line) &&(line <= ld->to_line) ) &&
+        ((line >= ld->from_line) && (line <= ld->to_line) ) &&
         (0 == regexec (&ld->component_regex, comp, 0, NULL, 0)) &&
         (0 == regexec (&ld->file_regex, file, 0, NULL, 0)) &&
         (0 == regexec (&ld->function_regex, function, 0, NULL, 0)))
@@ -693,6 +695,8 @@ parse_all_definitions ()
     parse_definitions ("GNUNET_LOG", 0);
   gnunet_log_parsed = GNUNET_YES;
 }
+
+
 #endif
 
 
@@ -823,8 +827,7 @@ output_message (enum GNUNET_ErrorType kind,
        * interactively, yet the same message shouldn't look
        * this way if the output is going to logfiles or robots
        * instead.
-       */
-      fprintf (GNUNET_stderr, "* %s", msg);
+       */fprintf (GNUNET_stderr, "* %s", msg);
     }
     else if (GNUNET_YES == current_async_scope.have_scope)
     {
@@ -1545,7 +1548,8 @@ GNUNET_async_scope_get (struct GNUNET_AsyncScopeSave *scope_ret)
 /**
  * Initializer
  */
-void __attribute__ ((constructor)) GNUNET_util_cl_init ()
+void __attribute__ ((constructor))
+GNUNET_util_cl_init ()
 {
   GNUNET_stderr = stderr;
 }
@@ -1554,9 +1558,11 @@ void __attribute__ ((constructor)) GNUNET_util_cl_init ()
 /**
  * Destructor
  */
-void __attribute__ ((destructor)) GNUNET_util_cl_fini ()
+void __attribute__ ((destructor))
+GNUNET_util_cl_fini ()
 {
 
 }
 
+
 /* end of common_logging.c */
diff --git a/src/util/configuration_loader.c b/src/util/configuration_loader.c
index b043a2e12..b9e5cb67f 100644
--- a/src/util/configuration_loader.c
+++ b/src/util/configuration_loader.c
@@ -84,4 +84,5 @@ GNUNET_CONFIGURATION_load (struct GNUNET_CONFIGURATION_Handle *cfg,
   return GNUNET_OK;
 }
 
+
 /* end of configuration_loader.c */
diff --git a/src/util/container_bloomfilter.c b/src/util/container_bloomfilter.c
index cb7984c3f..eca651862 100644
--- a/src/util/container_bloomfilter.c
+++ b/src/util/container_bloomfilter.c
@@ -149,6 +149,7 @@ setBit (char *bitArray, unsigned int bitIdx)
   bitArray[arraySlot] |= targetBit;
 }
 
+
 /**
  * Clears a bit from bitArray. Bit is cleared from the array
  * only if the respective usage counter on the disk hits/is zero.
@@ -167,6 +168,7 @@ clearBit (char *bitArray, unsigned int bitIdx)
   bitArray[slot] = bitArray[slot] & (~targetBit);
 }
 
+
 /**
  * Checks if a bit is active in the bitArray
  *
@@ -188,6 +190,7 @@ testBit (char *bitArray, unsigned int bitIdx)
     return GNUNET_NO;
 }
 
+
 /**
  * Sets a bit active in the bitArray and increments
  * bit-specific usage counter on disk (but only if
@@ -238,6 +241,7 @@ incrementBit (char *bitArray,
   GNUNET_assert (1 == GNUNET_DISK_file_write (fh, &value, 1));
 }
 
+
 /**
  * Clears a bit from bitArray if the respective usage
  * counter on the disk hits/is zero.
@@ -302,6 +306,7 @@ decrementBit (char *bitArray,
   GNUNET_assert (1 == GNUNET_DISK_file_write (fh, &value, 1));
 }
 
+
 #define BUFFSIZE 65536
 
 /**
@@ -342,6 +347,7 @@ make_empty_file (const struct GNUNET_DISK_FileHandle *fh, size_t size)
   return GNUNET_OK;
 }
 
+
 /* ************** GNUNET_CONTAINER_BloomFilter iterator ********* */
 
 /**
@@ -474,6 +480,7 @@ testBitCallback (void *cls,
   return GNUNET_YES;
 }
 
+
 /* *********************** INTERFACE **************** */
 
 /**
@@ -796,6 +803,7 @@ GNUNET_CONTAINER_bloomfilter_or (struct GNUNET_CONTAINER_BloomFilter *bf,
   return GNUNET_OK;
 }
 
+
 /**
  * Or the entries of the given raw data array with the
  * data of the given bloom filter.  Assumes that
@@ -854,6 +862,7 @@ GNUNET_CONTAINER_bloomfilter_remove (struct GNUNET_CONTAINER_BloomFilter *bf,
   iterateBits (bf, &decrementBitCallback, bf, e);
 }
 
+
 /**
  * Resize a bloom filter.  Note that this operation
  * is pretty costly.  Essentially, the bloom filter
@@ -889,4 +898,5 @@ GNUNET_CONTAINER_bloomfilter_resize (struct GNUNET_CONTAINER_BloomFilter *bf,
     GNUNET_CONTAINER_bloomfilter_add (bf, &hc);
 }
 
+
 /* end of container_bloomfilter.c */
diff --git a/src/util/container_meta_data.c b/src/util/container_meta_data.c
index 9cbd54f49..ad362408e 100644
--- a/src/util/container_meta_data.c
+++ b/src/util/container_meta_data.c
@@ -35,7 +35,6 @@
                                         __VA_ARGS__)
 
 
-
 /**
  * Try to compress the given block of data using libz.  Only returns
  * the compressed block if compression worked and the new block is
diff --git a/src/util/crypto_abe.c b/src/util/crypto_abe.c
index 1fe648e5a..97ff01680 100644
--- a/src/util/crypto_abe.c
+++ b/src/util/crypto_abe.c
@@ -78,6 +78,7 @@ init_aes (element_t k, int enc,
   return rc;
 }
 
+
 static int
 aes_128_cbc_encrypt (char*pt,
                      int size,
@@ -116,6 +117,7 @@ aes_128_cbc_encrypt (char*pt,
   return buf_size;
 }
 
+
 static int
 aes_128_cbc_decrypt (char*ct,
                      int size,
@@ -149,6 +151,7 @@ aes_128_cbc_decrypt (char*ct,
   return len;
 }
 
+
 struct GNUNET_CRYPTO_AbeMasterKey*
 GNUNET_CRYPTO_cpabe_create_master_key (void)
 {
@@ -161,6 +164,7 @@ GNUNET_CRYPTO_cpabe_create_master_key (void)
   return key;
 }
 
+
 void
 GNUNET_CRYPTO_cpabe_delete_master_key (struct GNUNET_CRYPTO_AbeMasterKey *key)
 {
@@ -171,6 +175,7 @@ GNUNET_CRYPTO_cpabe_delete_master_key (struct GNUNET_CRYPTO_AbeMasterKey *key)
   GNUNET_free (key);
 }
 
+
 struct GNUNET_CRYPTO_AbeKey*
 GNUNET_CRYPTO_cpabe_create_key (struct GNUNET_CRYPTO_AbeMasterKey *key,
                                 char **attrs)
@@ -188,6 +193,7 @@ GNUNET_CRYPTO_cpabe_create_key (struct GNUNET_CRYPTO_AbeMasterKey *key,
   return prv_key;
 }
 
+
 void
 GNUNET_CRYPTO_cpabe_delete_key (struct GNUNET_CRYPTO_AbeKey *key,
                                 int delete_pub)
@@ -199,6 +205,7 @@ GNUNET_CRYPTO_cpabe_delete_key (struct GNUNET_CRYPTO_AbeKey *key,
   GNUNET_free (key);
 }
 
+
 ssize_t
 write_cpabe (void **result,
              uint32_t file_len,
@@ -227,6 +234,7 @@ write_cpabe (void **result,
   return 12 + cph_buf_len + aes_buf_len;
 }
 
+
 ssize_t
 read_cpabe (const void *data,
             char**cph_buf,
@@ -257,6 +265,7 @@ read_cpabe (const void *data,
   return buf_len;
 }
 
+
 ssize_t
 GNUNET_CRYPTO_cpabe_encrypt (const void *block,
                              size_t size,
@@ -290,6 +299,7 @@ GNUNET_CRYPTO_cpabe_encrypt (const void *block,
   return result_len;
 }
 
+
 ssize_t
 GNUNET_CRYPTO_cpabe_decrypt (const void *block,
                              size_t size,
@@ -329,6 +339,7 @@ GNUNET_CRYPTO_cpabe_decrypt (const void *block,
   return plt_len;
 }
 
+
 ssize_t
 GNUNET_CRYPTO_cpabe_serialize_key (const struct GNUNET_CRYPTO_AbeKey *key,
                                    void **result)
@@ -351,6 +362,7 @@ GNUNET_CRYPTO_cpabe_serialize_key (const struct GNUNET_CRYPTO_AbeKey *key,
   return len;
 }
 
+
 struct GNUNET_CRYPTO_AbeKey*
 GNUNET_CRYPTO_cpabe_deserialize_key (const void *data,
                                      size_t len)
@@ -375,6 +387,7 @@ GNUNET_CRYPTO_cpabe_deserialize_key (const void *data,
   return key;
 }
 
+
 ssize_t
 GNUNET_CRYPTO_cpabe_serialize_master_key (const struct
                                           GNUNET_CRYPTO_AbeMasterKey *key,
@@ -398,6 +411,7 @@ GNUNET_CRYPTO_cpabe_serialize_master_key (const struct
   return len;
 }
 
+
 struct GNUNET_CRYPTO_AbeMasterKey*
 GNUNET_CRYPTO_cpabe_deserialize_master_key (const void *data,
                                             size_t len)
diff --git a/src/util/crypto_crc.c b/src/util/crypto_crc.c
index acc4a8ab4..5b01d5efe 100644
--- a/src/util/crypto_crc.c
+++ b/src/util/crypto_crc.c
@@ -72,6 +72,7 @@ crc_init ()
   }
 }
 
+
 /*
  * This computes the standard preset and inverted CRC, as used
  * by most networking standards.  Start by passing in an initial
diff --git a/src/util/crypto_ecc.c b/src/util/crypto_ecc.c
index 6b11cdada..0e5c3d1ca 100644
--- a/src/util/crypto_ecc.c
+++ b/src/util/crypto_ecc.c
@@ -640,8 +640,7 @@ GNUNET_CRYPTO_ecdhe_key_create2 (struct GNUNET_CRYPTO_EcdhePrivateKey *pk)
      but should also be harmless. For libgcrypt < 1.7, using 'eddsa'
      disables an expensive key testing routine. We do not want to run
      the expensive check for ECDHE, as we generate TONS of keys to
-     use for a very short time. */
-  if (0 != (rc = gcry_sexp_build (&s_keyparam,
+     use for a very short time. */if (0 != (rc = gcry_sexp_build (&s_keyparam,
                                   NULL,
                                   "(genkey(ecc(curve \"" CURVE "\")"
                                   "(flags eddsa no-keytest)))")))
@@ -735,6 +734,7 @@ GNUNET_CRYPTO_ecdsa_key_create ()
   return priv;
 }
 
+
 /**
  * Create a new private key. Caller must free return value.
  *
@@ -1651,6 +1651,7 @@ GNUNET_CRYPTO_ecdh_eddsa (const struct GNUNET_CRYPTO_EcdhePrivateKey *priv,
   return ret;
 }
 
+
 /**
  * @ingroup crypto
  * Derive key material from a ECDSA public key and a private ECDH key.
@@ -1672,4 +1673,5 @@ GNUNET_CRYPTO_ecdh_ecdsa (const struct GNUNET_CRYPTO_EcdhePrivateKey *priv,
                                    key_material);
 }
 
+
 /* end of crypto_ecc.c */
diff --git a/src/util/crypto_ecc_setup.c b/src/util/crypto_ecc_setup.c
index 0ce9f9d1e..b3d410b7a 100644
--- a/src/util/crypto_ecc_setup.c
+++ b/src/util/crypto_ecc_setup.c
@@ -497,4 +497,5 @@ GNUNET_CRYPTO_eddsa_setup_key (const char *cfg_name)
   GNUNET_CONFIGURATION_destroy (cfg);
 }
 
+
 /* end of crypto_ecc_setup.c */
diff --git a/src/util/crypto_hash_file.c b/src/util/crypto_hash_file.c
index 0dff6326c..e070918d3 100644
--- a/src/util/crypto_hash_file.c
+++ b/src/util/crypto_hash_file.c
@@ -239,4 +239,5 @@ GNUNET_CRYPTO_hash_file_cancel (struct GNUNET_CRYPTO_FileHashContext *fhc)
   GNUNET_free (fhc);
 }
 
+
 /* end of crypto_hash_file.c */
diff --git a/src/util/crypto_hkdf.c b/src/util/crypto_hkdf.c
index fea4f9861..99a50a449 100644
--- a/src/util/crypto_hkdf.c
+++ b/src/util/crypto_hkdf.c
@@ -49,7 +49,6 @@
 #define DEBUG_HKDF 0
 
 
-
 #if GNUNET_BUILD
 #include "platform.h"
 #include "gnunet_crypto_lib.h"
@@ -84,6 +83,7 @@ doHMAC (gcry_md_hd_t mac, const void *key, size_t key_len, const void *buf,
   return (const void *) gcry_md_read (mac, 0);
 }
 
+
 /**
  * @brief Generate pseudo-random key
  * @param mac gcrypt HMAC handle
@@ -122,6 +122,8 @@ dump (const char *src, const void *p, unsigned int l)
   }
   printf ("\n");
 }
+
+
 #endif
 
 
@@ -302,4 +304,5 @@ GNUNET_CRYPTO_hkdf (void *result, size_t out_len, int xtr_algo, int prf_algo,
   return ret;
 }
 
+
 /* end of crypto_hkdf.c */
diff --git a/src/util/crypto_kdf.c b/src/util/crypto_kdf.c
index ac881b055..43a9731ff 100644
--- a/src/util/crypto_kdf.c
+++ b/src/util/crypto_kdf.c
@@ -62,9 +62,7 @@ GNUNET_CRYPTO_kdf_v (void *result,
    * hash function."
    *
    * http://eprint.iacr.org/2010/264
-   */
-
-  return GNUNET_CRYPTO_hkdf_v (result,
+   */return GNUNET_CRYPTO_hkdf_v (result,
                                out_len,
                                GCRY_MD_SHA512,
                                GCRY_MD_SHA256,
@@ -171,4 +169,5 @@ GNUNET_CRYPTO_kdf_mod_mpi (gcry_mpi_t *r,
   }
 }
 
+
 /* end of crypto_kdf.c */
diff --git a/src/util/crypto_mpi.c b/src/util/crypto_mpi.c
index 5f1b456a5..51a29ac7c 100644
--- a/src/util/crypto_mpi.c
+++ b/src/util/crypto_mpi.c
@@ -145,4 +145,5 @@ GNUNET_CRYPTO_mpi_scan_unsigned (gcry_mpi_t *result,
   }
 }
 
+
 /* end of crypto_mpi.c */
diff --git a/src/util/crypto_paillier.c b/src/util/crypto_paillier.c
index 75d607706..0a08509ba 100644
--- a/src/util/crypto_paillier.c
+++ b/src/util/crypto_paillier.c
@@ -246,8 +246,7 @@ GNUNET_CRYPTO_paillier_encrypt (const struct
      number has the same length (or is smaller), by counting the
      number of possible operations.  We essentially divide max_num by
      2 until the result is no longer larger than 'm', incrementing the
-     maximum number of operations in each round, starting at -2 */
-  for (possible_opts = -2; gcry_mpi_cmp (max_num, m) > 0; possible_opts++)
+     maximum number of operations in each round, starting at -2 */for (possible_opts = -2; gcry_mpi_cmp (max_num, m) > 0; possible_opts++)
     gcry_mpi_div (max_num,
                   NULL,
                   max_num,
@@ -481,4 +480,5 @@ GNUNET_CRYPTO_paillier_hom_get_remaining (const struct
   return ntohl (c->remaining_ops);
 }
 
+
 /* end of crypto_paillier.c */
diff --git a/src/util/crypto_random.c b/src/util/crypto_random.c
index f70763757..ffcabd0df 100644
--- a/src/util/crypto_random.c
+++ b/src/util/crypto_random.c
@@ -70,6 +70,8 @@ glibc_weak_rand32 ()
   glibc_weak_rand32_state = val;
   return val;
 }
+
+
 #endif
 
 /**
@@ -331,7 +333,8 @@ w_check (const void *p)
 /**
  * Initialize libgcrypt.
  */
-void __attribute__ ((constructor)) GNUNET_CRYPTO_random_init ()
+void __attribute__ ((constructor))
+GNUNET_CRYPTO_random_init ()
 {
   gcry_error_t rc;
 
@@ -369,7 +372,8 @@ void __attribute__ ((constructor)) GNUNET_CRYPTO_random_init ()
 /**
  * Nicely shut down libgcrypt.
  */
-void __attribute__ ((destructor)) GNUNET_CRYPTO_random_fini ()
+void __attribute__ ((destructor))
+GNUNET_CRYPTO_random_fini ()
 {
   gcry_set_progress_handler (NULL, NULL);
 #ifdef GCRYCTL_CLOSE_RANDOM_DEVICE
diff --git a/src/util/crypto_rsa.c b/src/util/crypto_rsa.c
index edabcd6d5..5c18e0b15 100644
--- a/src/util/crypto_rsa.c
+++ b/src/util/crypto_rsa.c
@@ -1181,8 +1181,7 @@ GNUNET_CRYPTO_rsa_verify (const struct GNUNET_HashCode *hash,
      * so the exchange is being malicious in an unfamilair way, maybe
      * just trying to crash us.  Arguably, we've only an internal error
      * though because we should've detected this in our previous call
-     * to GNUNET_CRYPTO_rsa_unblind. */
-    return GNUNET_NO;
+     * to GNUNET_CRYPTO_rsa_unblind. */return GNUNET_NO;
   }
 
   data = mpi_to_sexp (r);
diff --git a/src/util/crypto_symmetric.c b/src/util/crypto_symmetric.c
index a6e22521a..51414b00e 100644
--- a/src/util/crypto_symmetric.c
+++ b/src/util/crypto_symmetric.c
@@ -258,4 +258,5 @@ GNUNET_CRYPTO_symmetric_derive_iv_v (struct
                        argp);
 }
 
+
 /* end of crypto_symmetric.c */
diff --git a/src/util/disk.c b/src/util/disk.c
index 32667d554..47a0ed5c9 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -194,6 +194,7 @@ GNUNET_DISK_handle_invalid (const struct GNUNET_DISK_FileHandle *h)
   return ((! h) || (h->fd == -1)) ? GNUNET_YES : GNUNET_NO;
 }
 
+
 /**
  * Get the size of an open file.
  *
@@ -1145,10 +1146,11 @@ GNUNET_DISK_filename_canonicalize (char *fn)
   {
     c = *idx;
 
-    if ((c == '/') ||(c == '\\') ||(c == ':') ||(c == '*') ||(c == '?') ||(c ==
-                                                                           '"')
+    if ((c == '/') || (c == '\\') || (c == ':') || (c == '*') || (c == '?') ||
+        (c ==
+         '"')
         ||
-        (c == '<') ||(c == '>') ||(c == '|') )
+        (c == '<') || (c == '>') || (c == '|') )
     {
       *idx = '_';
     }
@@ -1465,6 +1467,7 @@ GNUNET_DISK_file_map (const struct GNUNET_DISK_FileHandle *h,
   return (*m)->addr;
 }
 
+
 /**
  * Unmap a file
  * @param h mapping handle
@@ -1662,6 +1665,7 @@ GNUNET_DISK_pipe_close_end (struct GNUNET_DISK_PipeHandle *p,
   return ret;
 }
 
+
 /**
  * Detaches one of the ends from the pipe.
  * Detached end is a fully-functional FileHandle, it will
diff --git a/src/util/getopt.c b/src/util/getopt.c
index 8ec148e15..acc1b6535 100644
--- a/src/util/getopt.c
+++ b/src/util/getopt.c
@@ -203,6 +203,7 @@ my_index (const char *str, int chr)
   return 0;
 }
 
+
 /* If using GCC, we can safely declare strlen this way.
    If not using GCC, it is ok not to declare it.  */
 #ifdef __GNUC__
@@ -213,6 +214,7 @@ my_index (const char *str, int chr)
    and has done so at least since version 2.4.5. -- rms.  */
 extern int
 strlen (const char *);
+
 #endif /* not __STDC__ */
 #endif /* __GNUC__ */
 
@@ -241,6 +243,7 @@ static int last_nonopt;
 #if defined(__STDC__) && __STDC__
 static void
 exchange (char **);
+
 #endif
 
 static void
@@ -300,11 +303,13 @@ exchange (char **argv)
   last_nonopt = GNoptind;
 }
 
+
 /* Initialize the internal data when the first call is made.  */
 
 #if defined(__STDC__) && __STDC__
 static const char *
 _getopt_initialize (int, char *const *, const char *);
+
 #endif
 static const char *
 _getopt_initialize (int argc, char *const *argv, const char *optstring)
@@ -339,6 +344,7 @@ _getopt_initialize (int argc, char *const *argv, const char *optstring)
   return optstring;
 }
 
+
 /* Scan elements of ARGV (whose length is ARGC) for option characters
    given in OPTSTRING.
 
@@ -408,7 +414,7 @@ GN_getopt_internal (int argc,
 
   GNoptarg = NULL;
 
-  if ((GNoptind == 0)|| ! __getopt_initialized)
+  if ((GNoptind == 0) || ! __getopt_initialized)
   {
     if (GNoptind == 0)
       GNoptind = 1;   /* Don't scan ARGV[0], the program name.  */
@@ -422,7 +428,7 @@ GN_getopt_internal (int argc,
    * is only used when the used in the GNU libc.  */
 #define NONOPTION_P (argv[GNoptind][0] != '-' || argv[GNoptind][1] == '\0')
 
-  if ((nextchar == NULL)||(*nextchar == '\0'))
+  if ((nextchar == NULL) || (*nextchar == '\0'))
   {
     /* Advance to the next ARGV-element.  */
 
@@ -438,7 +444,7 @@ GN_getopt_internal (int argc,
       /* If we have just processed some options following some non-options,
        * exchange them so that the options come first.  */
 
-      if ((first_nonopt != last_nonopt) &&(last_nonopt != GNoptind) )
+      if ((first_nonopt != last_nonopt) && (last_nonopt != GNoptind) )
         exchange ((char **) argv);
       else if (last_nonopt != GNoptind)
         first_nonopt = GNoptind;
@@ -459,7 +465,7 @@ GN_getopt_internal (int argc,
     {
       GNoptind++;
 
-      if ((first_nonopt != last_nonopt) &&(last_nonopt != GNoptind) )
+      if ((first_nonopt != last_nonopt) && (last_nonopt != GNoptind) )
         exchange ((char **) argv);
       else if (first_nonopt == last_nonopt)
         first_nonopt = GNoptind;
@@ -511,10 +517,8 @@ GN_getopt_internal (int argc,
    * the ARGV-element is "-fu", do consider that an abbreviation of
    * the long option, just like "--fu", and not "-f" with arg "u".
    *
-   * This distinction seems to be the most useful approach.  */
-
-  if ((longopts != NULL)&&
-      ((argv[GNoptind][1] == '-')||
+   * This distinction seems to be the most useful approach.  */if ((longopts != NULL) &&
+      ((argv[GNoptind][1] == '-') ||
        (long_only &&
         (argv[GNoptind][2] || ! my_index (optstring, argv[GNoptind][1])))))
   {
@@ -632,7 +636,7 @@ GN_getopt_internal (int argc,
      * or the option starts with '--' or is not a valid short
      * option, then it's an error.
      * Otherwise interpret it as a short option.  */
-    if (! long_only ||(argv[GNoptind][1] == '-') ||
+    if (! long_only || (argv[GNoptind][1] == '-') ||
         (my_index (optstring, *nextchar) == NULL) )
     {
       if (GNopterr)
@@ -667,7 +671,7 @@ GN_getopt_internal (int argc,
     if (*nextchar == '\0')
       ++GNoptind;
 
-    if ((temp == NULL)||(c == ':'))
+    if ((temp == NULL) || (c == ':'))
     {
       if (GNopterr)
       {
@@ -680,7 +684,7 @@ GN_getopt_internal (int argc,
       return '?';
     }
     /* Convenience. Treat POSIX -W foo same as long option --foo */
-    if ((temp[0] == 'W')&&(temp[1] == ';'))
+    if ((temp[0] == 'W') && (temp[1] == ';'))
     {
       char *nameend;
       const struct GNoption *p;
@@ -871,6 +875,7 @@ GNgetopt_long (int argc,
   return GN_getopt_internal (argc, argv, options, long_options, opt_index, 0);
 }
 
+
 /* ******************** now the GNUnet specific modifications... ********************* */
 
 /**
@@ -1008,4 +1013,5 @@ GNUNET_GETOPT_run (const char *binaryOptions,
   return GNoptind;
 }
 
+
 /* end of getopt.c */
diff --git a/src/util/gnunet-config.c b/src/util/gnunet-config.c
index c225f8f1f..f101e8b61 100644
--- a/src/util/gnunet-config.c
+++ b/src/util/gnunet-config.c
@@ -337,4 +337,5 @@ main (int argc, char *const *argv)
   return ret;
 }
 
+
 /* end of gnunet-config.c */
diff --git a/src/util/gnunet-ecc.c b/src/util/gnunet-ecc.c
index 72e50b2a8..02d2020ad 100644
--- a/src/util/gnunet-ecc.c
+++ b/src/util/gnunet-ecc.c
@@ -115,8 +115,7 @@ create_keys (const char *fn, const char *prefix)
        * n = 5/8 = 0 (bytes)
        * rest = 5%8 = 5 (bits)
        * mask = ~(2**(8 - 5) - 1) = ~(2**3 - 1) = ~(8 - 1) = ~b111 = b11111000
-       */
-      mask = ~((int) pow (2, 8 - rest) - 1);
+       */mask = ~((int) pow (2, 8 - rest) - 1);
       target_byte = ((unsigned char *) &target_pub)[n] & mask;
     }
     else
@@ -480,4 +479,5 @@ main (int argc, char *const *argv)
   return ret;
 }
 
+
 /* end of gnunet-ecc.c */
diff --git a/src/util/gnunet-resolver.c b/src/util/gnunet-resolver.c
index 83329635a..d2f3acd45 100644
--- a/src/util/gnunet-resolver.c
+++ b/src/util/gnunet-resolver.c
@@ -182,4 +182,5 @@ main (int argc, char *const *argv)
   return ret;
 }
 
+
 /* end of gnunet-resolver.c */
diff --git a/src/util/gnunet-scrypt.c b/src/util/gnunet-scrypt.c
index e5de0ba73..8d8451950 100644
--- a/src/util/gnunet-scrypt.c
+++ b/src/util/gnunet-scrypt.c
@@ -344,4 +344,5 @@ main (int argc, char *const *argv)
   return ret;
 }
 
+
 /* end of gnunet-scrypt.c */
diff --git a/src/util/gnunet-service-resolver.c b/src/util/gnunet-service-resolver.c
index d7d456fba..c82a18ab8 100644
--- a/src/util/gnunet-service-resolver.c
+++ b/src/util/gnunet-service-resolver.c
@@ -704,6 +704,7 @@ pack (const char *hostname,
   return GNUNET_OK;
 }
 
+
 static void
 cache_answers (const char *name,
                struct GNUNET_DNSPARSER_Record *records,
@@ -738,6 +739,7 @@ cache_answers (const char *name,
   }
 }
 
+
 /**
  * We got a result from DNS. Add it to the cache and
  * see if we can make our client happy...
@@ -1366,12 +1368,15 @@ GNUNET_SERVICE_MAIN (
 /**
  * MINIMIZE heap size (way below 128k) since this process doesn't need much.
  */
-void __attribute__ ((constructor)) GNUNET_RESOLVER_memory_init ()
+void __attribute__ ((constructor))
+GNUNET_RESOLVER_memory_init ()
 {
   mallopt (M_TRIM_THRESHOLD, 4 * 1024);
   mallopt (M_TOP_PAD, 1 * 1024);
   malloc_trim (0);
 }
+
+
 #endif
 
 
diff --git a/src/util/gnunet-timeout.c b/src/util/gnunet-timeout.c
index cd6707db8..f650475cb 100644
--- a/src/util/gnunet-timeout.c
+++ b/src/util/gnunet-timeout.c
@@ -116,4 +116,5 @@ main (int argc, char *argv[])
   exit (-1);
 }
 
+
 /* end of timeout_watchdog.c */
diff --git a/src/util/gnunet-uri.c b/src/util/gnunet-uri.c
index a80ac0997..84100ff56 100644
--- a/src/util/gnunet-uri.c
+++ b/src/util/gnunet-uri.c
@@ -188,4 +188,5 @@ main (int argc, char *const *argv)
   return ((GNUNET_OK == ret) && (0 == exit_code)) ? 0 : 1;
 }
 
+
 /* end of gnunet-uri.c */
diff --git a/src/util/helper.c b/src/util/helper.c
index 9ebbdb188..8c8fb7b6a 100644
--- a/src/util/helper.c
+++ b/src/util/helper.c
@@ -683,6 +683,7 @@ GNUNET_HELPER_send (struct GNUNET_HELPER_Handle *h,
   return sh;
 }
 
+
 /**
  * Cancel a #GNUNET_HELPER_send operation.  If possible, transmitting the
  * message is also aborted, but at least 'cont' won't be
diff --git a/src/util/load.c b/src/util/load.c
index bab2f375e..cfbfa36d6 100644
--- a/src/util/load.c
+++ b/src/util/load.c
@@ -169,8 +169,7 @@ calculate_load (struct GNUNET_LOAD_Value *load)
    * stddev = (sum (val_i - avg)^2) / (n-1)
    * = (sum (val_i^2 - 2 avg val_i + avg^2) / (n-1)
    * = (sum (val_i^2) - 2 avg sum (val_i) + n * avg^2) / (n-1)
-   */
-  sum_val_i = (double) load->cummulative_delay;
+   */sum_val_i = (double) load->cummulative_delay;
   n = ((double) load->cummulative_request_count);
   nm1 = n - 1.0;
   avgdel = sum_val_i / n;
@@ -254,5 +253,4 @@ GNUNET_LOAD_update (struct GNUNET_LOAD_Value *load, uint64_t data)
 }
 
 
-
 /* end of load.c */
diff --git a/src/util/mst.c b/src/util/mst.c
index a3f1368e4..7fe93c55c 100644
--- a/src/util/mst.c
+++ b/src/util/mst.c
@@ -415,5 +415,4 @@ GNUNET_MST_destroy (struct GNUNET_MessageStreamTokenizer *mst)
 }
 
 
-
 /* end of server_mst.c */
diff --git a/src/util/nc.c b/src/util/nc.c
index 9db321b8c..49c95c14e 100644
--- a/src/util/nc.c
+++ b/src/util/nc.c
@@ -223,4 +223,5 @@ GNUNET_notification_context_get_size (struct GNUNET_NotificationContext *nc)
   return num;
 }
 
+
 /* end of nc.c */
diff --git a/src/util/network.c b/src/util/network.c
index ce4f2f896..99de5a7aa 100644
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -323,6 +323,8 @@ socket_set_nosigpipe (const struct GNUNET_NETWORK_Handle *h)
     return GNUNET_SYSERR;
   return GNUNET_OK;
 }
+
+
 #endif
 
 
@@ -1385,4 +1387,5 @@ GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds,
                   GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us) ? NULL : &tv);
 }
 
+
 /* end of network.c */
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index a4ef199cc..7aa4d1254 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -207,6 +207,8 @@ get_path_from_proc_exe ()
   lnk[size] = '\0';
   return GNUNET_strdup (lnk);
 }
+
+
 #endif
 
 
@@ -292,6 +294,8 @@ get_path_from_dyld_image ()
   }
   return NULL;
 }
+
+
 #endif
 
 
diff --git a/src/util/os_network.c b/src/util/os_network.c
index e310455e0..9ee26f0a9 100644
--- a/src/util/os_network.c
+++ b/src/util/os_network.c
@@ -381,6 +381,8 @@ try_ip (GNUNET_OS_NetworkInterfaceProcessor proc,
   pclose (f);
   return GNUNET_OK;
 }
+
+
 #endif
 
 
@@ -403,7 +405,7 @@ GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
   {
     for (ifa_ptr = ifa_first; ifa_ptr != NULL; ifa_ptr = ifa_ptr->ifa_next)
     {
-      if ((ifa_ptr->ifa_name != NULL) &&(ifa_ptr->ifa_addr != NULL) &&
+      if ((ifa_ptr->ifa_name != NULL) && (ifa_ptr->ifa_addr != NULL) &&
           ( (ifa_ptr->ifa_flags & IFF_UP) != 0) )
       {
         if ((ifa_ptr->ifa_addr->sa_family != AF_INET) &&
diff --git a/src/util/os_priority.c b/src/util/os_priority.c
index ad510a9b3..3b4858ca4 100644
--- a/src/util/os_priority.c
+++ b/src/util/os_priority.c
@@ -293,7 +293,6 @@ GNUNET_OS_process_destroy (struct GNUNET_OS_Process *proc)
 }
 
 
-
 /**
  * Open '/dev/null' and make the result the given
  * file descriptor.
diff --git a/src/util/peer.c b/src/util/peer.c
index 3216f1a57..257922f36 100644
--- a/src/util/peer.c
+++ b/src/util/peer.c
@@ -250,5 +250,4 @@ GNUNET_PEER_resolve2 (GNUNET_PEER_Id id)
 }
 
 
-
 /* end of peer.c */
diff --git a/src/util/perf_crypto_asymmetric.c b/src/util/perf_crypto_asymmetric.c
index 1f2182909..7594733b0 100644
--- a/src/util/perf_crypto_asymmetric.c
+++ b/src/util/perf_crypto_asymmetric.c
@@ -128,4 +128,5 @@ main (int argc, char *argv[])
   return 0;
 }
 
+
 /* end of perf_crypto_asymmetric.c */
diff --git a/src/util/perf_crypto_ecc_dlog.c b/src/util/perf_crypto_ecc_dlog.c
index 106b07026..8a0e4676b 100644
--- a/src/util/perf_crypto_ecc_dlog.c
+++ b/src/util/perf_crypto_ecc_dlog.c
@@ -173,4 +173,5 @@ main (int argc, char *argv[])
   return 0;
 }
 
+
 /* end of perf_crypto_ecc_dlog.c */
diff --git a/src/util/perf_crypto_hash.c b/src/util/perf_crypto_hash.c
index 95eca8e7a..3bd483639 100644
--- a/src/util/perf_crypto_hash.c
+++ b/src/util/perf_crypto_hash.c
@@ -110,4 +110,5 @@ main (int argc, char *argv[])
   return 0;
 }
 
+
 /* end of perf_crypto_hash.c */
diff --git a/src/util/perf_crypto_paillier.c b/src/util/perf_crypto_paillier.c
index dd5622108..35e6cce16 100644
--- a/src/util/perf_crypto_paillier.c
+++ b/src/util/perf_crypto_paillier.c
@@ -91,4 +91,5 @@ main (int argc, char *argv[])
   return 0;
 }
 
+
 /* end of perf_crypto_paillier.c */
diff --git a/src/util/perf_crypto_rsa.c b/src/util/perf_crypto_rsa.c
index c65739f1f..d652e8d4e 100644
--- a/src/util/perf_crypto_rsa.c
+++ b/src/util/perf_crypto_rsa.c
@@ -88,8 +88,7 @@ eval (unsigned int len)
           64 * 1024 / (1 +
                        GNUNET_TIME_absolute_get_duration
                        (start).rel_value_us / 1000LL), "keys/ms");
-   */
-  start = GNUNET_TIME_absolute_get ();
+   */start = GNUNET_TIME_absolute_get ();
   GNUNET_CRYPTO_hash ("test", 4, &hc);
   for (i = 0; i < 10; i++)
   {
diff --git a/src/util/perf_crypto_symmetric.c b/src/util/perf_crypto_symmetric.c
index c05700155..8176361ba 100644
--- a/src/util/perf_crypto_symmetric.c
+++ b/src/util/perf_crypto_symmetric.c
@@ -73,4 +73,5 @@ main (int argc, char *argv[])
   return 0;
 }
 
+
 /* end of perf_crypto_aes.c */
diff --git a/src/util/perf_malloc.c b/src/util/perf_malloc.c
index 3682777bd..727e15979 100644
--- a/src/util/perf_malloc.c
+++ b/src/util/perf_malloc.c
@@ -62,4 +62,5 @@ main (int argc, char *argv[])
   return 0;
 }
 
+
 /* end of perf_malloc.c */
diff --git a/src/util/program.c b/src/util/program.c
index 630ec6205..5ad069edd 100644
--- a/src/util/program.c
+++ b/src/util/program.c
@@ -318,8 +318,7 @@ GNUNET_PROGRAM_run2 (int argc,
      specified in the configuration, remember the command-line option
      in "cfg".  This is typically really only having an effect if we
      are running code in src/arm/, as obviously the rest of the code
-     has little business with ARM-specific options. */
-  if (GNUNET_YES != GNUNET_CONFIGURATION_have_value (cfg, "arm", "CONFIG"))
+     has little business with ARM-specific options. */if (GNUNET_YES != GNUNET_CONFIGURATION_have_value (cfg, "arm", "CONFIG"))
   {
     if (NULL != cc.cfgfile)
       GNUNET_CONFIGURATION_set_value_string (cfg, "arm", "CONFIG", cc.cfgfile);
diff --git a/src/util/scheduler.c b/src/util/scheduler.c
index 89dba3799..48a3f04ce 100644
--- a/src/util/scheduler.c
+++ b/src/util/scheduler.c
@@ -1380,6 +1380,8 @@ check_fd (struct GNUNET_SCHEDULER_Task *t, int raw_fd)
     }
   }
 }
+
+
 #endif
 
 
@@ -1564,6 +1566,7 @@ GNUNET_SCHEDULER_add_write_net (struct GNUNET_TIME_Relative delay,
                                                  task, task_cls);
 }
 
+
 /**
  * Schedule a new task to be run with a specified delay or when the
  * specified file descriptor is ready.  The delay can be
@@ -1857,8 +1860,7 @@ GNUNET_SCHEDULER_add_select (enum GNUNET_SCHEDULER_Priority prio,
    * this case gracefully because some libraries such as libmicrohttpd
    * only provide a hint what the maximum FD number in an FD set might be
    * and not the exact FD number (see e.g. gnunet-rest-service.c)
-   */
-  int no_fds_extracted = (0 == read_nhandles_len) &&
+   */int no_fds_extracted = (0 == read_nhandles_len) &&
                          (0 == read_fhandles_len) &&
                          (0 == write_nhandles_len) &&
                          (0 == write_fhandles_len);
@@ -2024,8 +2026,7 @@ GNUNET_SCHEDULER_do_work (struct GNUNET_SCHEDULER_Handle *sh)
        *
        * It might also mean we are busy-waiting because of a programming
        * error in the external event loop.
-       */
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
+       */LOG (GNUNET_ERROR_TYPE_DEBUG,
            "GNUNET_SCHEDULER_do_work did not find any ready "
            "tasks and timeout has not been reached yet.\n");
     }
diff --git a/src/util/signal.c b/src/util/signal.c
index fd7eecdd3..8b9a9a291 100644
--- a/src/util/signal.c
+++ b/src/util/signal.c
@@ -72,6 +72,7 @@ GNUNET_SIGNAL_handler_install (int signum, GNUNET_SIGNAL_Handler handler)
   return ret;
 }
 
+
 void
 GNUNET_SIGNAL_handler_uninstall (struct GNUNET_SIGNAL_Context *ctx)
 {
diff --git a/src/util/socks.c b/src/util/socks.c
index c2e012f1c..756be753a 100644
--- a/src/util/socks.c
+++ b/src/util/socks.c
@@ -387,8 +387,7 @@ transmit_ready (void *cls, size_t size, void *buf)
    * connection.c tells us nothing itself, but mostly its timouts.
    * Initially, we'll simply ignore this and leave massive timeouts, but
    * maybe that should change for error handling pruposes.  It appears that
-   * successful operations, including DNS resolution, do not use this.  */
-  if (NULL == buf)
+   * successful operations, including DNS resolution, do not use this.  */if (NULL == buf)
   {
     if (0 == ih->step)
     {
@@ -629,7 +628,7 @@ GNUNET_SOCKS_do_connect (const char *service_name,
     port0 = 9050;
   /* A typical Tor client should usually try port 9150 for the TBB too, but
    * GNUnet can probably assume a system Tor installation. */
-  if ((port0 > 65535)||(port0 <= 0))
+  if ((port0 > 65535) || (port0 <= 0))
   {
     LOG (GNUNET_ERROR_TYPE_WARNING,
          _ (
@@ -686,4 +685,5 @@ GNUNET_SOCKS_do_connect (const char *service_name,
   return GNUNET_SOCKS_run_handshake (ih, socks5);
 }
 
+
 /* socks.c */
diff --git a/src/util/speedup.c b/src/util/speedup.c
index 81fdab48a..3d9e82319 100644
--- a/src/util/speedup.c
+++ b/src/util/speedup.c
@@ -115,4 +115,5 @@ GNUNET_SPEEDUP_stop_ ()
          "Stopped execution speed up\n");
 }
 
+
 /* end of speedup.c */
diff --git a/src/util/strings.c b/src/util/strings.c
index 3442a6bf7..4e7451283 100644
--- a/src/util/strings.c
+++ b/src/util/strings.c
@@ -754,9 +754,7 @@ GNUNET_STRINGS_absolute_time_to_string (struct GNUNET_TIME_Absolute t)
    * As for msvcrt, use the wide variant, which always returns utf16
    * (otherwise we'd have to detect current codepage or use W32API character
    * set conversion routines to convert to UTF8).
-   */
-
-  strftime (buf, sizeof(buf), "%a %b %d %H:%M:%S %Y", tp);
+   */strftime (buf, sizeof(buf), "%a %b %d %H:%M:%S %Y", tp);
 
   return buf;
 }
@@ -1052,9 +1050,9 @@ GNUNET_STRINGS_parse_uri (const char *path,
         pp_state += 1;
         continue;
       }
-      if (! (((path[i] >= 'A') &&(path[i] <= 'Z') ) ||
-             ((path[i] >= 'a') &&(path[i] <= 'z') ) ||
-             ((path[i] >= '0') &&(path[i] <= '9') ) ||(path[i] == '+') ||
+      if (! (((path[i] >= 'A') && (path[i] <= 'Z') ) ||
+             ((path[i] >= 'a') && (path[i] <= 'z') ) ||
+             ((path[i] >= '0') && (path[i] <= '9') ) || (path[i] == '+') ||
              (path[i] == '-') || (path[i] == '.')))
         end = 1;
       break;
@@ -1898,6 +1896,7 @@ GNUNET_STRINGS_base64_encode (const void *in, size_t len, char **output)
   return ret;
 }
 
+
 #define cvtfind(a)                        \
   ((((a) >= 'A') && ((a) <= 'Z'))         \
    ? (a) - 'A'                          \
diff --git a/src/util/test_bio.c b/src/util/test_bio.c
index 180cada76..8ff93c168 100644
--- a/src/util/test_bio.c
+++ b/src/util/test_bio.c
@@ -76,6 +76,7 @@ test_normal_rw ()
   return 0;
 }
 
+
 static int
 test_nullstring_rw ()
 {
@@ -103,6 +104,7 @@ test_nullstring_rw ()
   return 0;
 }
 
+
 static int
 test_emptystring_rw ()
 {
@@ -130,6 +132,7 @@ test_emptystring_rw ()
   return 0;
 }
 
+
 static int
 test_bigstring_rw ()
 {
@@ -159,6 +162,7 @@ test_bigstring_rw ()
   return 0;
 }
 
+
 static int
 test_bigmeta_rw ()
 {
@@ -192,6 +196,7 @@ test_bigmeta_rw ()
   return 0;
 }
 
+
 static int
 test_directory_r ()
 {
@@ -212,6 +217,7 @@ test_directory_r ()
   return 0;
 }
 
+
 static int
 test_nullfile_rw ()
 {
@@ -287,6 +293,7 @@ test_fullfile_rw ()
   return 0;
 }
 
+
 static int
 test_fakestring_rw ()
 {
@@ -315,6 +322,7 @@ test_fakestring_rw ()
   return 0;
 }
 
+
 static int
 test_fakemeta_rw ()
 {
@@ -345,6 +353,7 @@ test_fakemeta_rw ()
   return 0;
 }
 
+
 static int
 test_fakebigmeta_rw ()
 {
@@ -375,6 +384,7 @@ test_fakebigmeta_rw ()
   return 0;
 }
 
+
 static int
 check_string_rw ()
 {
@@ -385,6 +395,7 @@ check_string_rw ()
   return 0;
 }
 
+
 static int
 check_metadata_rw ()
 {
@@ -394,6 +405,7 @@ check_metadata_rw ()
   return 0;
 }
 
+
 static int
 check_file_rw ()
 {
@@ -404,6 +416,7 @@ check_file_rw ()
   return 0;
 }
 
+
 int
 main (int argc, char *argv[])
 {
@@ -414,4 +427,5 @@ main (int argc, char *argv[])
   return 0;
 }
 
+
 /* end of test_bio.c */
diff --git a/src/util/test_client.c b/src/util/test_client.c
index fafb967b4..ef5765fff 100644
--- a/src/util/test_client.c
+++ b/src/util/test_client.c
@@ -192,4 +192,5 @@ main (int argc,
   return global_ret;
 }
 
+
 /* end of test_client.c */
diff --git a/src/util/test_common_allocation.c b/src/util/test_common_allocation.c
index 1c41a10bc..e2fc29e82 100644
--- a/src/util/test_common_allocation.c
+++ b/src/util/test_common_allocation.c
@@ -150,4 +150,5 @@ main (int argc, char *argv[])
   return ret;
 }
 
+
 /* end of test_common_allocation.c */
diff --git a/src/util/test_common_endian.c b/src/util/test_common_endian.c
index 0fc23fb44..10a85a1bb 100644
--- a/src/util/test_common_endian.c
+++ b/src/util/test_common_endian.c
@@ -39,4 +39,5 @@ main (int argc, char *argv[])
   return 0;
 }
 
+
 /* end of test_common_endian.c */
diff --git a/src/util/test_common_logging.c b/src/util/test_common_logging.c
index d905a3bf3..7d7656ed8 100644
--- a/src/util/test_common_logging.c
+++ b/src/util/test_common_logging.c
@@ -36,7 +36,6 @@ my_log (void *ctx, enum GNUNET_ErrorType kind, const char *component,
 }
 
 
-
 int
 main (int argc, char *argv[])
 {
@@ -96,4 +95,5 @@ main (int argc, char *argv[])
   return 0;
 }                               /* end of main */
 
+
 /* end of test_common_logging.c */
diff --git a/src/util/test_common_logging_dummy.c b/src/util/test_common_logging_dummy.c
index 9a08714ec..ffcad888e 100644
--- a/src/util/test_common_logging_dummy.c
+++ b/src/util/test_common_logging_dummy.c
@@ -62,6 +62,8 @@ expensive_func ()
 {
   return GNUNET_NETWORK_socket_select (NULL, NULL, NULL, OUTPUT_DELAY);
 }
+
+
 #endif
 
 
@@ -116,4 +118,5 @@ main (int argc, char *argv[])
   return 0;
 } /* end of main */
 
+
 /* end of test_common_logging_dummy.c */
diff --git a/src/util/test_common_logging_runtime_loglevels.c b/src/util/test_common_logging_runtime_loglevels.c
index b82138492..2f5efa198 100644
--- a/src/util/test_common_logging_runtime_loglevels.c
+++ b/src/util/test_common_logging_runtime_loglevels.c
@@ -113,8 +113,8 @@ read_output_line (int phase_from1, int phase_to1, int phase_from2,
   j = 0;
   int stage = 0;
 
-  if (! ((phase >= phase_from1)&&(phase <= phase_to1)) &&
-      ! ((phase >= phase_from2)&&(phase <= phase_to2)))
+  if (! ((phase >= phase_from1) && (phase <= phase_to1)) &&
+      ! ((phase >= phase_from2) && (phase <= phase_to2)))
     return p;
 #if 0
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -196,6 +196,7 @@ read_output_line (int phase_from1, int phase_to1, int phase_from2,
   return &r[i];
 }
 
+
 /**
  * Up to 8 non-skipped GNUNET_log() calls
  * + extra line with delay for each one
@@ -259,10 +260,9 @@ read_call (void *cls)
    * | 7D * * * *  * * * *
    * | 8  * *      * *
    * | 9  * *      * *
-   */
-  char *p = buf;
+   */char *p = buf;
 
-  if ((bytes == LOG_BUFFER_SIZE)||
+  if ((bytes == LOG_BUFFER_SIZE) ||
       ! (p =
            read_output_line (0, 3, 4, 9, 'L', "ERROR", -1,
                              1, phase, p,
@@ -453,4 +453,5 @@ main (int argc, char *argv[])
   return ok;
 }
 
+
 /* end of test_common_logging_runtime_loglevels.c */
diff --git a/src/util/test_configuration.c b/src/util/test_configuration.c
index c3a773ab6..6227a28db 100644
--- a/src/util/test_configuration.c
+++ b/src/util/test_configuration.c
@@ -123,7 +123,7 @@ diffsCallBack (void *cls, const char *section, const char *option,
                                                option, &diffValue);
       if (NULL != diffValue)
       {
-        if ((ret == GNUNET_SYSERR) ||(strcmp (diffValue, value) != 0) )
+        if ((ret == GNUNET_SYSERR) || (strcmp (diffValue, value) != 0) )
           cbData->status = 1;
       }
       else
@@ -204,6 +204,7 @@ editConfiguration (struct GNUNET_CONFIGURATION_Handle *cfg, int option)
   return diffsCB.cfgDiffs;
 }
 
+
 /**
  * Checking configuration diffs
  */
@@ -349,6 +350,7 @@ testConfig ()
   return 0;
 }
 
+
 static const char *want[] = {
   "/Hello",
   "/File Name",
@@ -371,6 +373,7 @@ check (void *data, const char *fn)
   return GNUNET_SYSERR;
 }
 
+
 static int
 testConfigFilenames ()
 {
diff --git a/src/util/test_container_bloomfilter.c b/src/util/test_container_bloomfilter.c
index 0217bad44..67fbaf38b 100644
--- a/src/util/test_container_bloomfilter.c
+++ b/src/util/test_container_bloomfilter.c
@@ -40,6 +40,7 @@ nextHC (struct GNUNET_HashCode *hc)
   GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK, hc);
 }
 
+
 static int
 add_iterator (void *cls, struct GNUNET_HashCode *next)
 {
@@ -53,6 +54,7 @@ add_iterator (void *cls, struct GNUNET_HashCode *next)
   return GNUNET_YES;
 }
 
+
 int
 main (int argc, char *argv[])
 {
diff --git a/src/util/test_container_dll.c b/src/util/test_container_dll.c
index b5c238511..33671d00b 100644
--- a/src/util/test_container_dll.c
+++ b/src/util/test_container_dll.c
@@ -109,4 +109,5 @@ main (int argc, char **argv)
   return 0;
 }
 
+
 /* end of test_container_heap.c */
diff --git a/src/util/test_container_heap.c b/src/util/test_container_heap.c
index 2530f3dbc..c83c7810f 100644
--- a/src/util/test_container_heap.c
+++ b/src/util/test_container_heap.c
@@ -35,6 +35,7 @@ iterator_callback (void *cls,
   return GNUNET_OK;
 }
 
+
 static int
 nstrcmp (const char *a, const char *b)
 {
@@ -43,6 +44,7 @@ nstrcmp (const char *a, const char *b)
   return strcmp (a, b);
 }
 
+
 static int
 check ()
 {
@@ -287,4 +289,5 @@ main (int argc, char **argv)
   return check ();
 }
 
+
 /* end of test_container_heap.c */
diff --git a/src/util/test_container_multihashmap.c b/src/util/test_container_multihashmap.c
index 1d82bd701..bd9e7af31 100644
--- a/src/util/test_container_multihashmap.c
+++ b/src/util/test_container_multihashmap.c
@@ -120,6 +120,7 @@ testMap (int i)
   return 0;
 }
 
+
 int
 main (int argc, char *argv[])
 {
@@ -134,4 +135,5 @@ main (int argc, char *argv[])
   return 0;
 }
 
+
 /* end of test_container_multihashmap.c */
diff --git a/src/util/test_container_multihashmap32.c b/src/util/test_container_multihashmap32.c
index 81b941d5e..92aac6eeb 100644
--- a/src/util/test_container_multihashmap32.c
+++ b/src/util/test_container_multihashmap32.c
@@ -90,6 +90,7 @@ testMap (int i)
   return 0;
 }
 
+
 int
 main (int argc, char *argv[])
 {
@@ -104,4 +105,5 @@ main (int argc, char *argv[])
   return 0;
 }
 
+
 /* end of test_container_multihashmap.c */
diff --git a/src/util/test_container_multipeermap.c b/src/util/test_container_multipeermap.c
index 19cd67080..9aeead56c 100644
--- a/src/util/test_container_multipeermap.c
+++ b/src/util/test_container_multipeermap.c
@@ -120,6 +120,7 @@ testMap (int i)
   return 0;
 }
 
+
 int
 main (int argc, char *argv[])
 {
@@ -134,4 +135,5 @@ main (int argc, char *argv[])
   return 0;
 }
 
+
 /* end of test_container_multipeermap.c */
diff --git a/src/util/test_crypto_ecc_dlog.c b/src/util/test_crypto_ecc_dlog.c
index b3b2a7480..a2c02a94e 100644
--- a/src/util/test_crypto_ecc_dlog.c
+++ b/src/util/test_crypto_ecc_dlog.c
@@ -164,7 +164,6 @@ test_math (struct GNUNET_CRYPTO_EccDlogContext *edc)
 }
 
 
-
 int
 main (int argc, char *argv[])
 {
@@ -192,4 +191,5 @@ main (int argc, char *argv[])
   return 0;
 }
 
+
 /* end of test_crypto_ecc_dlog.c */
diff --git a/src/util/test_crypto_ecdhe.c b/src/util/test_crypto_ecdhe.c
index 5e5b34c43..6f91be746 100644
--- a/src/util/test_crypto_ecdhe.c
+++ b/src/util/test_crypto_ecdhe.c
@@ -69,4 +69,5 @@ main (int argc, char *argv[])
   return 0;
 }
 
+
 /* end of test_crypto_ecdhe.c */
diff --git a/src/util/test_crypto_ecdsa.c b/src/util/test_crypto_ecdsa.c
index d6f406b47..826097d52 100644
--- a/src/util/test_crypto_ecdsa.c
+++ b/src/util/test_crypto_ecdsa.c
@@ -174,6 +174,8 @@ testSignPerformance ()
             GNUNET_YES));
   return ok;
 }
+
+
 #endif
 
 
@@ -245,4 +247,5 @@ main (int argc, char *argv[])
   return 0;
 }
 
+
 /* end of test_crypto_ecdsa.c */
diff --git a/src/util/test_crypto_eddsa.c b/src/util/test_crypto_eddsa.c
index f51316463..ac991cef5 100644
--- a/src/util/test_crypto_eddsa.c
+++ b/src/util/test_crypto_eddsa.c
@@ -119,6 +119,8 @@ testSignPerformance ()
             GNUNET_YES));
   return ok;
 }
+
+
 #endif
 
 
@@ -210,4 +212,5 @@ main (int argc, char *argv[])
   return 0;
 }
 
+
 /* end of test_crypto_eddsa.c */
diff --git a/src/util/test_crypto_hash.c b/src/util/test_crypto_hash.c
index 0118dd754..12e1324dd 100644
--- a/src/util/test_crypto_hash.c
+++ b/src/util/test_crypto_hash.c
@@ -49,6 +49,7 @@ test (int number)
   return 0;
 }
 
+
 static int
 testEncoding ()
 {
@@ -60,6 +61,7 @@ testEncoding ()
   return 0;
 }
 
+
 static int
 testArithmetic ()
 {
@@ -99,6 +101,7 @@ testArithmetic ()
   return 0;
 }
 
+
 static void
 finished_task (void *cls, const struct GNUNET_HashCode *res)
 {
@@ -156,4 +159,5 @@ main (int argc, char *argv[])
   return 0;
 }
 
+
 /* end of hashingtest.c */
diff --git a/src/util/test_crypto_hash_context.c b/src/util/test_crypto_hash_context.c
index d744b52b4..8c652595f 100644
--- a/src/util/test_crypto_hash_context.c
+++ b/src/util/test_crypto_hash_context.c
@@ -27,7 +27,8 @@
 
 #define LEN 1234
 
-int main ()
+int
+main ()
 {
   char data[1234];
   struct GNUNET_HashCode hc1;
diff --git a/src/util/test_crypto_hkdf.c b/src/util/test_crypto_hkdf.c
index c41c3362b..85be5bb80 100644
--- a/src/util/test_crypto_hkdf.c
+++ b/src/util/test_crypto_hkdf.c
@@ -60,6 +60,7 @@ tc1 ()
   GNUNET_assert (memcmp (result + l, "\0", 2) == 0);
 }
 
+
 void
 tc2 ()
 {
@@ -107,6 +108,7 @@ tc2 ()
   GNUNET_assert (memcmp (result + l, "\0", 2) == 0);
 }
 
+
 void
 tc3 ()
 {
@@ -129,6 +131,7 @@ tc3 ()
   GNUNET_assert (memcmp (result + l, "\0", 2) == 0);
 }
 
+
 void
 tc4 ()
 {
@@ -156,6 +159,7 @@ tc4 ()
   GNUNET_assert (memcmp (result + l, "\0", 2) == 0);
 }
 
+
 void
 tc5 ()
 {
@@ -202,6 +206,7 @@ tc5 ()
   GNUNET_assert (memcmp (result + l, "\0", 2) == 0);
 }
 
+
 void
 tc6 ()
 {
@@ -224,6 +229,7 @@ tc6 ()
   GNUNET_assert (memcmp (result + l, "\0", 2) == 0);
 }
 
+
 void
 tc7 ()
 {
@@ -277,6 +283,7 @@ tc7 ()
   GNUNET_assert (memcmp (result + l, "\0", 2) == 0);
 }
 
+
 void
 tc8 ()
 {
@@ -309,6 +316,7 @@ tc8 ()
   GNUNET_assert (memcmp (result + l, "\0", 2) == 0);
 }
 
+
 int
 main ()
 {
diff --git a/src/util/test_crypto_paillier.c b/src/util/test_crypto_paillier.c
index 755d0ff38..64c9569cb 100644
--- a/src/util/test_crypto_paillier.c
+++ b/src/util/test_crypto_paillier.c
@@ -243,4 +243,5 @@ main (int argc,
   return ret;
 }
 
+
 /* end of test_crypto_paillier.c */
diff --git a/src/util/test_crypto_random.c b/src/util/test_crypto_random.c
index e0a8fb72a..5e159d949 100644
--- a/src/util/test_crypto_random.c
+++ b/src/util/test_crypto_random.c
@@ -56,6 +56,7 @@ test (enum GNUNET_CRYPTO_Quality mode)
   return 0;
 }
 
+
 int
 main (int argc, char *argv[])
 {
diff --git a/src/util/test_crypto_symmetric.c b/src/util/test_crypto_symmetric.c
index 0d83d5aa1..9f6cd5ed0 100644
--- a/src/util/test_crypto_symmetric.c
+++ b/src/util/test_crypto_symmetric.c
@@ -171,4 +171,5 @@ main (int argc, char *argv[])
   return 0;
 }
 
+
 /* end of test_crypto_aes.c */
diff --git a/src/util/test_disk.c b/src/util/test_disk.c
index 7ed61c332..6969e49e6 100644
--- a/src/util/test_disk.c
+++ b/src/util/test_disk.c
@@ -105,6 +105,7 @@ testOpenClose ()
   return 0;
 }
 
+
 static int ok;
 
 
diff --git a/src/util/test_os_network.c b/src/util/test_os_network.c
index 8e4e31f2e..cca29df0f 100644
--- a/src/util/test_os_network.c
+++ b/src/util/test_os_network.c
@@ -87,4 +87,5 @@ main (int argc, char *argv[])
   return ret;
 }
 
+
 /* end of test_os_network.c */
diff --git a/src/util/test_os_start_process.c b/src/util/test_os_start_process.c
index fbcfa6729..2bdca5c9d 100644
--- a/src/util/test_os_start_process.c
+++ b/src/util/test_os_start_process.c
@@ -296,4 +296,5 @@ main (int argc, char *argv[])
   return ret;
 }
 
+
 /* end of test_os_start_process.c */
diff --git a/src/util/test_peer.c b/src/util/test_peer.c
index 5a7203507..320746c76 100644
--- a/src/util/test_peer.c
+++ b/src/util/test_peer.c
@@ -104,8 +104,7 @@ check ()
    * Attempt to convert pid = 0 (which is reserved)
    * into a peer identity object, the peer identity memory
    * is expected to be set to zero
-   */
-  GNUNET_log_skip (1, GNUNET_YES);
+   */GNUNET_log_skip (1, GNUNET_YES);
   GNUNET_PEER_resolve (0, &res);
   GNUNET_assert (0 ==
                  GNUNET_is_zero (&res));
@@ -137,4 +136,5 @@ main ()
   return 0;
 }
 
+
 /* end of test_peer.c */
diff --git a/src/util/test_plugin.c b/src/util/test_plugin.c
index d93af8db1..c0eb717d6 100644
--- a/src/util/test_plugin.c
+++ b/src/util/test_plugin.c
@@ -65,4 +65,5 @@ main (int argc, char *argv[])
   return 0;
 }
 
+
 /* end of test_plugin.c */
diff --git a/src/util/test_plugin_plug.c b/src/util/test_plugin_plug.c
index b754c4c4d..39c8774b1 100644
--- a/src/util/test_plugin_plug.c
+++ b/src/util/test_plugin_plug.c
@@ -31,6 +31,7 @@ libgnunet_plugin_test_init (void *arg)
   return NULL;
 }
 
+
 void *
 libgnunet_plugin_test_done (void *arg)
 {
@@ -39,4 +40,5 @@ libgnunet_plugin_test_done (void *arg)
   return NULL;
 }
 
+
 /* end of test_plugin_plug.c */
diff --git a/src/util/test_program.c b/src/util/test_program.c
index 5362c61cc..912a581a5 100644
--- a/src/util/test_program.c
+++ b/src/util/test_program.c
@@ -134,4 +134,5 @@ main (int argc, char *argv[])
   return ok;
 }
 
+
 /* end of test_program.c */
diff --git a/src/util/test_scheduler.c b/src/util/test_scheduler.c
index 2fe8f6f5c..02a70a560 100644
--- a/src/util/test_scheduler.c
+++ b/src/util/test_scheduler.c
@@ -289,4 +289,5 @@ main (int argc, char *argv[])
   return ret;
 }
 
+
 /* end of test_scheduler.c */
diff --git a/src/util/test_scheduler_delay.c b/src/util/test_scheduler_delay.c
index 7dfb36291..003fac196 100644
--- a/src/util/test_scheduler_delay.c
+++ b/src/util/test_scheduler_delay.c
@@ -91,4 +91,5 @@ main (int argc, char *argv[])
   return 0;
 }
 
+
 /* end of test_scheduler_delay.c */
diff --git a/src/util/test_service.c b/src/util/test_service.c
index 6db8471bd..61afc0cc5 100644
--- a/src/util/test_service.c
+++ b/src/util/test_service.c
@@ -234,4 +234,5 @@ main (int argc,
   return ret;
 }
 
+
 /* end of test_service.c */
diff --git a/src/util/test_socks.c b/src/util/test_socks.c
index b813937c2..f7e0596eb 100644
--- a/src/util/test_socks.c
+++ b/src/util/test_socks.c
@@ -253,4 +253,5 @@ main (int argc, char *argv[])
   return ok;
 }
 
+
 /* end of test_socks.c */
diff --git a/src/util/test_speedup.c b/src/util/test_speedup.c
index dfb8db915..bca6886aa 100644
--- a/src/util/test_speedup.c
+++ b/src/util/test_speedup.c
@@ -122,4 +122,5 @@ main (int argc, char *argv[])
   return 1;
 }
 
+
 /* end of test_speedup.c */
diff --git a/src/util/test_tun.c b/src/util/test_tun.c
index ecb3dd664..ad4a5c19e 100644
--- a/src/util/test_tun.c
+++ b/src/util/test_tun.c
@@ -63,8 +63,10 @@ test_udp (size_t pll,
   }
 }
 
-int main (int argc,
-          char **argv)
+
+int
+main (int argc,
+      char **argv)
 {
   test_udp (4, 3, 22439);
   test_udp (4, 1, 23467);
diff --git a/src/util/time.c b/src/util/time.c
index 5b4833511..a07801922 100644
--- a/src/util/time.c
+++ b/src/util/time.c
@@ -342,6 +342,7 @@ GNUNET_TIME_absolute_get_remaining (struct GNUNET_TIME_Absolute future)
   return ret;
 }
 
+
 /**
  * Compute the time difference between the given start and end times.
  * Use this function instead of actual subtraction to ensure that
@@ -363,6 +364,7 @@ GNUNET_TIME_absolute_get_difference (struct GNUNET_TIME_Absolute start,
   return ret;
 }
 
+
 /**
  * Get the duration of an operation as the
  * difference of the current time and the given start time "whence".
@@ -926,9 +928,11 @@ GNUNET_TIME_absolute_get_monotonic (
 /**
  * Destructor
  */
-void __attribute__ ((destructor)) GNUNET_util_time_fini ()
+void __attribute__ ((destructor))
+GNUNET_util_time_fini ()
 {
   (void) GNUNET_TIME_absolute_get_monotonic (NULL);
 }
 
+
 /* end of time.c */