run indent twice, it alternates between two 'canonical' forms, also run whitespace remover

29 files changed, 76 insertions, 76 deletions

diff --git a/src/util/bandwidth.c b/src/util/bandwidth.c
index 95ff4bfff..8d81e55a0 100644
--- a/src/util/bandwidth.c
+++ b/src/util/bandwidth.c
@@ -20,7 +20,7 @@
 
 /**
  * @file util/bandwidth.c
- * @brief functions related to bandwidth (unit) 
+ * @brief functions related to bandwidth (unit)
  * @author Christian Grothoff
  */
 #include "platform.h"
diff --git a/src/util/client.c b/src/util/client.c
index 2b866e6f8..4e6093a68 100644
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -103,7 +103,7 @@ struct GNUNET_CLIENT_TransmitHandle
 
 
 /**
- * Context for processing 
+ * Context for processing
  * "GNUNET_CLIENT_transmit_and_get_response" requests.
  */
 struct TransmitGetResponseContext
@@ -692,7 +692,7 @@ write_test (void *cls, size_t size, void *buf)
  *
  * @param service name of the service to wait for
  * @param cfg configuration to use
- * @param timeout how long to wait at most 
+ * @param timeout how long to wait at most
  * @param task task to run if service is running
  *        (reason will be "PREREQ_DONE" (service running)
  *         or "TIMEOUT" (service not known to be running))
@@ -1108,7 +1108,7 @@ GNUNET_CLIENT_notify_transmit_ready (struct GNUNET_CLIENT_Connection *sock,
 
 /**
  * Cancel a request for notification.
- * 
+ *
  * @param th handle from the original request.
  */
 void
@@ -1188,7 +1188,7 @@ transmit_for_response (void *cls, size_t size, void *buf)
  *        if the caller does not care about temporary connection errors,
  *        for example because the protocol is stateless
  * @param rn function to call with the response
- * @param rn_cls closure for rn 
+ * @param rn_cls closure for rn
  * @return GNUNET_OK on success, GNUNET_SYSERR if a request
  *         is already pending
  */
diff --git a/src/util/configuration.c b/src/util/configuration.c
index 534949652..c69042175 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -495,7 +495,7 @@ GNUNET_CONFIGURATION_remove_section (struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param cls the destination configuration (struct GNUNET_CONFIGURATION_Handle*)
  * @param section section for the value
  * @param option option name of the value
- * @param value value to copy 
+ * @param value value to copy
  */
 static void
 copy_entry (void *cls, const char *section, const char *option,
diff --git a/src/util/connection.c b/src/util/connection.c
index 9aeca9096..8639d2416 100644
--- a/src/util/connection.c
+++ b/src/util/connection.c
@@ -111,7 +111,7 @@ struct GNUNET_CONNECTION_TransmitHandle
 
 /**
  * During connect, we try multiple possible IP addresses
- * to find out which one might work. 
+ * to find out which one might work.
  */
 struct AddressProbe
 {
@@ -165,13 +165,13 @@ struct GNUNET_CONNECTION_Handle
   const struct GNUNET_CONFIGURATION_Handle *cfg;
 
   /**
-   * Linked list of sockets we are currently trying out 
+   * Linked list of sockets we are currently trying out
    * (during connect).
    */
   struct AddressProbe *ap_head;
 
   /**
-   * Linked list of sockets we are currently trying out 
+   * Linked list of sockets we are currently trying out
    * (during connect).
    */
   struct AddressProbe *ap_tail;
@@ -1047,7 +1047,7 @@ GNUNET_CONNECTION_check (struct GNUNET_CONNECTION_Handle *sock)
 /**
  * Close the socket and free associated resources. Pending
  * transmissions may be completed or dropped depending on the
- * arguments.   If a receive call is pending and should 
+ * arguments.   If a receive call is pending and should
  * NOT be completed, 'GNUNET_CONNECTION_receive_cancel'
  * should be called explicitly first.
  *
diff --git a/src/util/container_heap.c b/src/util/container_heap.c
index 059a5b253..cd4d7909a 100644
--- a/src/util/container_heap.c
+++ b/src/util/container_heap.c
@@ -1,17 +1,17 @@
 /*
   This file is part of GNUnet.
   (C) 2008, 2009 Christian Grothoff (and other contributing authors)
-  
+
   GNUnet is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published
   by the Free Software Foundation; either version 2, or (at your
   option) any later version.
-  
+
   GNUnet is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   General Public License for more details.
-  
+
   You should have received a copy of the GNU General Public License
   along with GNUnet; see the file COPYING.  If not, write to the
   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -481,7 +481,7 @@ remove_node (struct GNUNET_CONTAINER_HeapNode *node)
 
 /**
  * Removes a node from the heap.
- * 
+ *
  * @param node node to remove
  * @return element data stored at the node
  */
diff --git a/src/util/container_meta_data.c b/src/util/container_meta_data.c
index eb515e8fb..16173cca9 100644
--- a/src/util/container_meta_data.c
+++ b/src/util/container_meta_data.c
@@ -105,7 +105,7 @@ struct GNUNET_CONTAINER_MetaData
 
 /**
  * Create a fresh struct CONTAINER_MetaData token.
- * 
+ *
  * @return empty meta-data container
  */
 struct GNUNET_CONTAINER_MetaData *
@@ -251,7 +251,7 @@ GNUNET_CONTAINER_meta_data_test_equal (const struct GNUNET_CONTAINER_MetaData
  *        used in the main libextractor library and yielding
  *        meta data).
  * @param type libextractor-type describing the meta data
- * @param format basic format information about data 
+ * @param format basic format information about data
  * @param data_mime_type mime-type of data (not of the original file);
  *        can be NULL (if mime-type is not known)
  * @param data actual meta-data found
@@ -339,7 +339,7 @@ GNUNET_CONTAINER_meta_data_insert (struct GNUNET_CONTAINER_MetaData *md,
  *        used in the main libextractor library and yielding
  *        meta data).
  * @param type libextractor-type describing the meta data
- * @param format basic format information about data 
+ * @param format basic format information about data
  * @param data_mime_type mime-type of data (not of the original file);
  *        can be NULL (if mime-type is not known)
  * @param data actual meta-data found
@@ -587,7 +587,7 @@ GNUNET_CONTAINER_meta_data_get_thumbnail (const struct GNUNET_CONTAINER_MetaData
 
 /**
  * Duplicate struct GNUNET_CONTAINER_MetaData.
- * 
+ *
  * @param md what to duplicate
  * @return duplicate meta-data container
  */
diff --git a/src/util/container_slist.c b/src/util/container_slist.c
index 2d7c24c03..1dd0344e4 100644
--- a/src/util/container_slist.c
+++ b/src/util/container_slist.c
@@ -55,7 +55,7 @@ struct GNUNET_CONTAINER_SList_Elem
 
 
 /**
- * Handle to a singly linked list  
+ * Handle to a singly linked list
  */
 struct GNUNET_CONTAINER_SList
 {
@@ -77,7 +77,7 @@ struct GNUNET_CONTAINER_SList
 
 
 /**
- * Handle to a singly linked list iterator 
+ * Handle to a singly linked list iterator
  */
 struct GNUNET_CONTAINER_SList_Iterator
 {
diff --git a/src/util/crypto_hash.c b/src/util/crypto_hash.c
index 6438784ba..c253bbf2f 100644
--- a/src/util/crypto_hash.c
+++ b/src/util/crypto_hash.c
@@ -340,7 +340,7 @@ GNUNET_CRYPTO_hash_from_string (const char *enc, GNUNET_HashCode * result)
  * fast, not involve bits[0] or bits[4] (they're used elsewhere), and be
  * somewhat consistent. And of course, the result should be a positive
  * number.
- * 
+ *
  * @param a some hash code
  * @param b some hash code
  * @return a positive number which is a measure for
diff --git a/src/util/crypto_kdf.c b/src/util/crypto_kdf.c
index cd665ad23..eff4e6fd6 100644
--- a/src/util/crypto_kdf.c
+++ b/src/util/crypto_kdf.c
@@ -53,7 +53,7 @@ GNUNET_CRYPTO_kdf_v (void *result, size_t out_len, const void *xts,
    * setting. Second, as shown in Section 6, using HMAC with a truncated output as an extractor
    * allows to prove the security of HKDF under considerably weaker assumptions on the underlying
    * hash function."
-   * 
+   *
    * http://eprint.iacr.org/2010/264
    */
 
diff --git a/src/util/crypto_random.c b/src/util/crypto_random.c
index bb105437d..445f99a62 100644
--- a/src/util/crypto_random.c
+++ b/src/util/crypto_random.c
@@ -32,7 +32,7 @@
 
 /**
  * Create a cryptographically weak pseudo-random number in the interval of 0 to 1.
- * 
+ *
  * @return number between 0 and 1.
  */
 static double
diff --git a/src/util/crypto_rsa.c b/src/util/crypto_rsa.c
index ec46b486c..46778a842 100644
--- a/src/util/crypto_rsa.c
+++ b/src/util/crypto_rsa.c
@@ -547,7 +547,7 @@ GNUNET_CRYPTO_rsa_decode_key (const char *buf, uint16_t len)
  * files does not exist, create a new key and write it to the
  * file.  Caller must free return value.  Note that this function
  * can not guarantee that another process might not be trying
- * the same operation on the same file at the same time. 
+ * the same operation on the same file at the same time.
  * If the contents of the file
  * are invalid the old file is deleted and a fresh key is
  * created.
diff --git a/src/util/disk.c b/src/util/disk.c
index 6ba5db773..9059852d3 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -139,7 +139,7 @@ translate_unix_perms (enum GNUNET_DISK_AccessPermissions perm)
 
 
 /**
- * Iterate over all files in the given directory and 
+ * Iterate over all files in the given directory and
  * accumulate their size.
  *
  * @param cls closure of type "struct GetFileSizeData"
@@ -339,7 +339,7 @@ GNUNET_DISK_file_get_identifiers (const char *filename, uint64_t * dev,
  * an absolute path, the current 'TMPDIR' will be prepended.  In any case,
  * 6 random characters will be appended to the name to create a unique
  * filename.
- * 
+ *
  * @param t component to use for the name;
  *        does NOT contain "XXXXXX" or "/tmp/".
  * @return NULL on error, otherwise name of fresh
@@ -767,7 +767,7 @@ GNUNET_DISK_file_write (const struct GNUNET_DISK_FileHandle * h,
  * @param fn file name
  * @param buffer the data to write
  * @param n number of bytes to write
- * @param mode file permissions 
+ * @param mode file permissions
  * @return number of bytes written on success, GNUNET_SYSERR on error
  */
 ssize_t
@@ -788,7 +788,7 @@ GNUNET_DISK_fn_write (const char *fn, const void *buffer, size_t n,
 }
 
 /**
- * Scan a directory for files. 
+ * Scan a directory for files.
  *
  * @param dirName the name of the directory
  * @param callback the method to call for each file,
diff --git a/src/util/getopt.c b/src/util/getopt.c
index eb79db757..d48183b2a 100644
--- a/src/util/getopt.c
+++ b/src/util/getopt.c
@@ -609,16 +609,16 @@ GN_getopt_internal (int argc, char *const *argv, const char *optstring,
   /* Decode the current option-ARGV-element.  */
 
   /* Check whether the ARGV-element is a long option.
-   * 
+   *
    * If long_only and the ARGV-element has the form "-f", where f is
    * a valid short option, don't consider it an abbreviated form of
    * a long option that starts with f.  Otherwise there would be no
    * way to give the -f short option.
-   * 
+   *
    * On the other hand, if there's a long option "fubar" and
    * 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 &&
diff --git a/src/util/getopt_helpers.c b/src/util/getopt_helpers.c
index d0c8c0e6a..d050ec99c 100644
--- a/src/util/getopt_helpers.c
+++ b/src/util/getopt_helpers.c
@@ -163,7 +163,7 @@ OUTER:
  * @param scls additional closure (will point to the 'int')
  * @param option name of the option
  * @param value not used (NULL)
- * @return GNUNET_OK 
+ * @return GNUNET_OK
  */
 int
 GNUNET_GETOPT_increment_value (struct GNUNET_GETOPT_CommandLineProcessorContext
@@ -178,7 +178,7 @@ GNUNET_GETOPT_increment_value (struct GNUNET_GETOPT_CommandLineProcessorContext
 
 
 /**
- * Set an option of type 'int' from the command line to 1 if the 
+ * Set an option of type 'int' from the command line to 1 if the
  * given option is present.
  * A pointer to this function should be passed as part of the
  * 'struct GNUNET_GETOPT_CommandLineOption' array to initialize options
@@ -189,7 +189,7 @@ GNUNET_GETOPT_increment_value (struct GNUNET_GETOPT_CommandLineProcessorContext
  * @param scls additional closure (will point to the 'int')
  * @param option name of the option
  * @param value not used (NULL)
- * @return GNUNET_OK 
+ * @return GNUNET_OK
  */
 int
 GNUNET_GETOPT_set_one (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx,
@@ -214,7 +214,7 @@ GNUNET_GETOPT_set_one (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx,
  *             which will be allocated)
  * @param option name of the option
  * @param value actual value of the option (a string)
- * @return GNUNET_OK 
+ * @return GNUNET_OK
  */
 int
 GNUNET_GETOPT_set_string (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx,
diff --git a/src/util/load.c b/src/util/load.c
index c7ef07295..35ed443c3 100644
--- a/src/util/load.c
+++ b/src/util/load.c
@@ -164,7 +164,7 @@ calculate_load (struct GNUNET_LOAD_Value *load)
   if (load->cummulative_request_count <= 1)
     return;
   /* calcuate std dev of latency; we have for n values of "i" that:
-   * 
+   *
    * avg = (sum val_i) / n
    * stddev = (sum (val_i - avg)^2) / (n-1)
    * = (sum (val_i^2 - 2 avg val_i + avg^2) / (n-1)
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index 00825f2b7..1f4c5f000 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -435,7 +435,7 @@ GNUNET_OS_installation_get_path (enum GNUNET_OS_InstallationPathKind dirkind)
  * PATH environment variable as a search path.
  *
  * @param binary the name of the file to check
- * @return GNUNET_YES if the file is SUID, 
+ * @return GNUNET_YES if the file is SUID,
  *         GNUNET_NO if not SUID (but binary exists)
  *         GNUNET_SYSERR on error (no such binary or not executable)
  */
diff --git a/src/util/peer.c b/src/util/peer.c
index cd5444a19..1491211c5 100644
--- a/src/util/peer.c
+++ b/src/util/peer.c
@@ -157,7 +157,7 @@ GNUNET_PEER_intern (const struct GNUNET_PeerIdentity *pid)
 
 /**
  * Decrement multiple RCs of peer identities by one.
- * 
+ *
  * @param ids array of PIDs to decrement the RCs of
  * @param count size of the ids array
  */
diff --git a/src/util/plugin.c b/src/util/plugin.c
index 08b32b295..dbd3519aa 100644
--- a/src/util/plugin.c
+++ b/src/util/plugin.c
@@ -151,7 +151,7 @@ resolve_function (struct PluginList *plug, const char *name)
  * Test if a plugin exists.
  *
  * Note that the library must export a symbol called
- * "library_name_init" for the test to succeed. 
+ * "library_name_init" for the test to succeed.
  *
  * @param library_name name of the plugin to test if it is installed
  * @return GNUNET_YES if the plugin exists, GNUNET_NO if not
diff --git a/src/util/pseudonym.c b/src/util/pseudonym.c
index 85a485098..85353c6da 100644
--- a/src/util/pseudonym.c
+++ b/src/util/pseudonym.c
@@ -31,41 +31,41 @@
 #include "gnunet_pseudonym_lib.h"
 #include "gnunet_bio_lib.h"
 
-/** 
+/**
  * Name of the directory which stores meta data for pseudonym
  */
 #define PS_METADATA_DIR DIR_SEPARATOR_STR "data" DIR_SEPARATOR_STR "pseudonyms" DIR_SEPARATOR_STR "metadata" DIR_SEPARATOR_STR
 
-/** 
+/**
  * Name of the directory which stores names for pseudonyms
  */
 #define PS_NAMES_DIR    DIR_SEPARATOR_STR "data" DIR_SEPARATOR_STR "pseudonyms" DIR_SEPARATOR_STR "names"    DIR_SEPARATOR_STR
 
 
-/** 
+/**
  * Registered callbacks for discovery of pseudonyms.
  */
 struct DiscoveryCallback
 {
-  /** 
+  /**
    * This is a linked list.
    */
   struct DiscoveryCallback *next;
 
-  /** 
+  /**
    * Function to call each time a pseudonym is discovered.
    */
   GNUNET_PSEUDONYM_Iterator callback;
 
-  /** 
+  /**
    * Closure for callback.
    */
   void *closure;
 };
 
 
-/** 
- * Head of the linked list of functions to call when 
+/**
+ * Head of the linked list of functions to call when
  * new pseudonyms are added.
  */
 static struct DiscoveryCallback *head;
@@ -280,7 +280,7 @@ read_info (const struct GNUNET_CONFIGURATION_Handle *cfg,
 /**
  * Return the unique, human readable name for the given namespace.
  *
- * @param cfg configuration 
+ * @param cfg configuration
  * @param nsid cryptographic ID of the namespace
  * @return NULL on failure (should never happen)
  */
@@ -489,7 +489,7 @@ list_pseudonym_helper (void *cls, const char *fullname)
 /**
  * List all available pseudonyms.
  *
- * @param cfg overall configuration 
+ * @param cfg overall configuration
  * @param iterator function to call for each pseudonym
  * @param closure closure for iterator
  * @return number of pseudonyms found
diff --git a/src/util/resolver_api.c b/src/util/resolver_api.c
index 3607ce67f..69c49d1e8 100644
--- a/src/util/resolver_api.c
+++ b/src/util/resolver_api.c
@@ -268,7 +268,7 @@ GNUNET_RESOLVER_disconnect ()
 /**
  * Convert IP address to string without DNS resolution.
  *
- * @param sa the address 
+ * @param sa the address
  * @param salen number of bytes in sa
  * @return address as a string, NULL on error
  */
@@ -469,7 +469,7 @@ handle_response (void *cls, const struct GNUNET_MessageHeader *msg)
 
 
 /**
- * We've been asked to lookup the address for a hostname and were 
+ * We've been asked to lookup the address for a hostname and were
  * given a valid numeric string.  Perform the callbacks for the
  * numeric addresses.
  *
@@ -524,7 +524,7 @@ numeric_resolution (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 /**
- * We've been asked to lookup the address for a hostname and were 
+ * We've been asked to lookup the address for a hostname and were
  * given a variant of "loopback".  Perform the callbacks for the
  * respective loopback numeric addresses.
  *
diff --git a/src/util/scheduler.c b/src/util/scheduler.c
index 52824d8b3..0ed48e793 100644
--- a/src/util/scheduler.c
+++ b/src/util/scheduler.c
@@ -613,7 +613,7 @@ destroy_task (struct Task *t)
  * empty.  Keep running tasks until we are either no longer running
  * "URGENT" tasks or until we have at least one "pending" task (which
  * may become ready, hence we should select on it).  Naturally, if
- * there are no more ready tasks, we also return.  
+ * there are no more ready tasks, we also return.
  *
  * @param rs FDs ready for reading
  * @param ws FDs ready for writing
@@ -726,7 +726,7 @@ sighandler_shutdown ()
 
 /**
  * Check if the system is still life. Trigger shutdown if we
- * have tasks, but none of them give us lifeness.  
+ * have tasks, but none of them give us lifeness.
  *
  * @return GNUNET_OK to continue the main loop,
  *         GNUNET_NO to exit
@@ -893,7 +893,7 @@ GNUNET_SCHEDULER_run (GNUNET_SCHEDULER_Task task, void *task_cls)
 
 /**
  * Obtain the reason code for why the current task was
- * started.  Will return the same value as 
+ * started.  Will return the same value as
  * the GNUNET_SCHEDULER_TaskContext's reason field.
  *
  * @return reason(s) why the current task is run
@@ -1134,7 +1134,7 @@ GNUNET_SCHEDULER_add_with_priority (enum GNUNET_SCHEDULER_Priority prio,
  * will be scheduled for execution once the delay has expired. It
  * will be run with the priority of the calling task.
  *
- * @param delay when should this operation time out? Use 
+ * @param delay when should this operation time out? Use
  *        GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown"
  * @param task main function of the task
  * @param task_cls closure of task
@@ -1404,7 +1404,7 @@ add_without_sets (struct GNUNET_TIME_Relative delay, int rfd, int wfd,
  * socket operation is ready.  It will be run with the priority of
  * the calling task.
  *
- * @param delay when should this operation time out? Use 
+ * @param delay when should this operation time out? Use
  *        GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown"
  * @param rfd read file-descriptor
  * @param task main function of the task
@@ -1445,7 +1445,7 @@ GNUNET_SCHEDULER_add_read_net (struct GNUNET_TIME_Relative delay,
  * socket operation is ready.  It will be run with the priority of
  * the calling task.
  *
- * @param delay when should this operation time out? Use 
+ * @param delay when should this operation time out? Use
  *        GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown"
  * @param wfd write file-descriptor
  * @param task main function of the task
@@ -1487,7 +1487,7 @@ GNUNET_SCHEDULER_add_write_net (struct GNUNET_TIME_Relative delay,
  * socket operation is ready. It will be run with the priority of
  * the calling task.
  *
- * @param delay when should this operation time out? Use 
+ * @param delay when should this operation time out? Use
  *        GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown"
  * @param rfd read file-descriptor
  * @param task main function of the task
@@ -1531,7 +1531,7 @@ GNUNET_SCHEDULER_add_read_file (struct GNUNET_TIME_Relative delay,
  * socket operation is ready. It will be run with the priority of
  * the calling task.
  *
- * @param delay when should this operation time out? Use 
+ * @param delay when should this operation time out? Use
  *        GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown"
  * @param wfd write file-descriptor
  * @param task main function of the task
diff --git a/src/util/server.c b/src/util/server.c
index ddbae4410..ce5d16e1e 100644
--- a/src/util/server.c
+++ b/src/util/server.c
@@ -742,7 +742,7 @@ process_incoming (void *cls, const void *buf, size_t available,
 
 /**
  * Process messages from the client's message tokenizer until either
- * the tokenizer is empty (and then schedule receiving more), or 
+ * the tokenizer is empty (and then schedule receiving more), or
  * until some handler is not immediately done (then wait for restart_processing)
  * or shutdown.
  *
@@ -1229,10 +1229,10 @@ GNUNET_SERVER_client_disable_corking (struct GNUNET_SERVER_Client *client)
 /**
  * Wrapper for transmission notification that calls the original
  * callback and update the last activity time for our connection.
- * 
+ *
  * @param cls the 'struct GNUNET_SERVER_Client'
  * @param size number of bytes we can transmit
- * @param buf where to copy the message 
+ * @param buf where to copy the message
  * @return number of bytes actually transmitted
  */
 static size_t
diff --git a/src/util/server_mst.c b/src/util/server_mst.c
index 07a7b30b8..ad3be8f63 100644
--- a/src/util/server_mst.c
+++ b/src/util/server_mst.c
@@ -110,7 +110,7 @@ GNUNET_SERVER_mst_create (GNUNET_SERVER_MessageTokenizerCallback cb,
  * @param client_identity ID of client for which this is a buffer
  * @param buf input data to add
  * @param size number of bytes in buf
- * @param purge should any excess bytes in the buffer be discarded 
+ * @param purge should any excess bytes in the buffer be discarded
  *       (i.e. for packet-based services like UDP)
  * @param one_shot only call callback once, keep rest of message in buffer
  * @return GNUNET_OK if we are done processing (need more data)
diff --git a/src/util/server_nc.c b/src/util/server_nc.c
index a5ee7e0d6..7a26ab9bf 100644
--- a/src/util/server_nc.c
+++ b/src/util/server_nc.c
@@ -21,7 +21,7 @@
 /**
  * @file util/server_nc.c
  * @brief convenience functions for transmission of
- *        a notification stream 
+ *        a notification stream
  * @author Christian Grothoff
  */
 
@@ -78,7 +78,7 @@ struct ClientList
   struct ClientList *next;
 
   /**
-   * Overall context this client belongs to. 
+   * Overall context this client belongs to.
    */
   struct GNUNET_SERVER_NotificationContext *nc;
 
diff --git a/src/util/service.c b/src/util/service.c
index 9b60dc56b..9e15ae1ab 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -751,7 +751,7 @@ add_unixpath (struct sockaddr **saddrs, socklen_t * saddrlens,
   *saddrs = (struct sockaddr *) un;
   *saddrlens = slen;
 #else
-  /* this function should never be called 
+  /* this function should never be called
    * unless AF_UNIX is defined! */
   GNUNET_assert (0);
 #endif
diff --git a/src/util/test_container_heap.c b/src/util/test_container_heap.c
index 62d675bbb..a2a004aa7 100644
--- a/src/util/test_container_heap.c
+++ b/src/util/test_container_heap.c
@@ -67,7 +67,7 @@ check ()
   n1 = GNUNET_CONTAINER_heap_peek (myHeap);
   GNUNET_assert (NULL == n1);
 
-  // GNUNET_CONTAINER_heap_walk_get_next: heap empty, taking if-branch 
+  // GNUNET_CONTAINER_heap_walk_get_next: heap empty, taking if-branch
   n1 = GNUNET_CONTAINER_heap_walk_get_next (myHeap);
   GNUNET_assert (NULL == n1);
 
@@ -75,7 +75,7 @@ check ()
   GNUNET_assert (NULL != n1);
 
 
-  // GNUNET_CONTAINER_heap_peek not empty, taking if-branch  
+  // GNUNET_CONTAINER_heap_peek not empty, taking if-branch
   n2 = NULL;
   n2 = GNUNET_CONTAINER_heap_peek (myHeap);
   GNUNET_assert (NULL != n2);
@@ -122,7 +122,7 @@ check ()
 
   GNUNET_CONTAINER_heap_destroy (myHeap);
 
-  // My additions to a complete testcase  
+  // My additions to a complete testcase
   // Testing a GNUNET_CONTAINER_HEAP_ORDER_MIN
   // Testing remove_node
 
diff --git a/src/util/test_peer.c b/src/util/test_peer.c
index 395d40712..1729114ff 100644
--- a/src/util/test_peer.c
+++ b/src/util/test_peer.c
@@ -32,7 +32,7 @@
 #define DEBUG GNUNET_NO
 
 /**
- * A list of Peer ID's to play with 
+ * A list of Peer ID's to play with
  */
 static struct GNUNET_PeerIdentity pidArr[NUMBER_OF_PEERS];
 
@@ -99,10 +99,10 @@ check ()
   GNUNET_PEER_resolve (1, &res);
   GNUNET_assert (0 == memcmp (&res, &pidArr[0], sizeof (res)));
 
-  /* 
-   * Attempt to convert pid = 0 (which is reserved) 
+  /*
+   * Attempt to convert pid = 0 (which is reserved)
    * into a peer identity object, the peer identity memory
-   * is expected to be set to zero 
+   * is expected to be set to zero
    */
   memset (&zero, 0, sizeof (struct GNUNET_PeerIdentity));
   GNUNET_log_skip (1, GNUNET_YES);
diff --git a/src/util/test_resolver_api.c b/src/util/test_resolver_api.c
index 563f204eb..704dc479b 100644
--- a/src/util/test_resolver_api.c
+++ b/src/util/test_resolver_api.c
@@ -32,7 +32,7 @@
 
 #define VERBOSE GNUNET_NO
 
-/** 
+/**
  * Using DNS root servers to check gnunet's resolver service
  * a.root-servers.net <-> 198.41.0.4 is a fix 1:1 mapping that should not change over years
  * For more information have a look at IANA's website http://www.root-servers.org/
diff --git a/src/util/time.c b/src/util/time.c
index 34880b08b..d3dd3b5ec 100644
--- a/src/util/time.c
+++ b/src/util/time.c
@@ -353,7 +353,7 @@ GNUNET_TIME_relative_divide (struct GNUNET_TIME_Relative rel,
 
 
 /**
- * Calculate the estimate time of arrival/completion 
+ * Calculate the estimate time of arrival/completion
  * for an operation.
  *
  * @param start when did the operation start?