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

36 files changed, 149 insertions, 149 deletions

diff --git a/src/include/block_fs.h b/src/include/block_fs.h
index c3dcdeced..9dc22e57f 100644
--- a/src/include/block_fs.h
+++ b/src/include/block_fs.h
@@ -140,7 +140,7 @@ struct NBlock
 
 
 /**
- * @brief index block (indexing a DBlock that 
+ * @brief index block (indexing a DBlock that
  *        can be obtained directly from reading
  *        the plaintext file)
  */
diff --git a/src/include/gnunet_ats_service.h b/src/include/gnunet_ats_service.h
index 618eab0a6..9317ace43 100644
--- a/src/include/gnunet_ats_service.h
+++ b/src/include/gnunet_ats_service.h
@@ -25,7 +25,7 @@
  *
  * TODO:
  * - move GNUNET_TRANSPORT_ATS* in here and rename...
- * - extend API to express communication preferences to ATS 
+ * - extend API to express communication preferences to ATS
  *   (to be called DIRECTLY from apps, not from transport/core!)
  */
 #ifndef GNUNET_ATS_SERVICE_H
@@ -47,7 +47,7 @@ struct GNUNET_ATS_Handle;
  * Signature of a function called by ATS to notify the callee that the
  * assigned bandwidth or address for a given peer was changed.  If the
  * callback is called with address/bandwidth assignments of zero, the
- * ATS disconnect function will still be called once the disconnect 
+ * ATS disconnect function will still be called once the disconnect
  * actually happened.
  *
  * @param cls closure
@@ -99,7 +99,7 @@ GNUNET_ATS_shutdown (struct GNUNET_ATS_Handle *atc);
 
 
 /**
- * Signature of a function that takes an address suggestion 
+ * Signature of a function that takes an address suggestion
  *
  * @param cls closure
  * @param peer identity of the new peer
@@ -117,7 +117,7 @@ typedef void (*GNUNET_ATS_AddressSuggestionCallback) (void *cls,
                                                       const char *plugin_name,
                                                       const void *plugin_addr,
                                                       size_t plugin_addr_len,
-                                                      struct Session *session,
+                                                      struct Session * session,
                                                       struct
                                                       GNUNET_BANDWIDTH_Value32NBO
                                                       bandwidth,
diff --git a/src/include/gnunet_block_lib.h b/src/include/gnunet_block_lib.h
index 66b2490c0..01a1ec2fc 100644
--- a/src/include/gnunet_block_lib.h
+++ b/src/include/gnunet_block_lib.h
@@ -69,7 +69,7 @@ enum GNUNET_BLOCK_Type
   GNUNET_BLOCK_TYPE_FS_SBLOCK = 4,
 
     /**
-     * Type of a block that is used to advertise a namespace.  
+     * Type of a block that is used to advertise a namespace.
      */
   GNUNET_BLOCK_TYPE_FS_NBLOCK = 5,
 
@@ -156,7 +156,7 @@ struct GNUNET_BLOCK_Context;
 
 /**
  * Mingle hash with the mingle_number to produce different bits.
- * 
+ *
  * @param in original hash code
  * @param mingle_number number for hash permutation
  * @param hc where to store the result.
@@ -188,7 +188,7 @@ GNUNET_BLOCK_context_destroy (struct GNUNET_BLOCK_Context *ctx);
 /**
  * Function called to validate a reply or a request.  For
  * request evaluation, simply pass "NULL" for the reply_block.
- * Note that it is assumed that the reply has already been 
+ * Note that it is assumed that the reply has already been
  * matched to the key (and signatures checked) as it would
  * be done with the "get_key" function.
  *
@@ -221,7 +221,7 @@ GNUNET_BLOCK_evaluate (struct GNUNET_BLOCK_Context *ctx,
  * @param block block to get the key for
  * @param block_size number of bytes in block
  * @param key set to the key (query) for the given block
- * @return GNUNET_YES on success, 
+ * @return GNUNET_YES on success,
  *         GNUNET_NO if the block is malformed
  *         GNUNET_SYSERR if type not supported
  *         (or if extracting a key from a block of this type does not work)
diff --git a/src/include/gnunet_block_plugin.h b/src/include/gnunet_block_plugin.h
index 6d1f2f103..0ead4afad 100644
--- a/src/include/gnunet_block_plugin.h
+++ b/src/include/gnunet_block_plugin.h
@@ -20,7 +20,7 @@
 
 /**
  * @file include/gnunet_block_plugin.h
- * @brief API for block plugins.  Each block plugin must conform to 
+ * @brief API for block plugins.  Each block plugin must conform to
  *        the API specified by this header.
  * @author Christian Grothoff
  */
@@ -35,7 +35,7 @@
 /**
  * Function called to validate a reply or a request.  For
  * request evaluation, simply pass "NULL" for the reply_block.
- * Note that it is assumed that the reply has already been 
+ * Note that it is assumed that the reply has already been
  * matched to the key (and signatures checked) as it would
  * be done with the "get_key" function.
  *
@@ -81,7 +81,7 @@ typedef enum
  * @param block block to get the key for
  * @param block_size number of bytes in block
  * @param key set to the key (query) for the given block
- * @return GNUNET_YES on success, 
+ * @return GNUNET_YES on success,
  *         GNUNET_NO if the block is malformed
  *         GNUNET_SYSERR if type not supported
  *         (or if extracting a key from a block of this type does not work)
@@ -112,7 +112,7 @@ struct GNUNET_BLOCK_PluginFunctions
   const enum GNUNET_BLOCK_Type *types;
 
   /**
-   * Main function of a block plugin.  Allows us to check if a 
+   * Main function of a block plugin.  Allows us to check if a
    * block matches a query.
    */
   GNUNET_BLOCK_EvaluationFunction evaluate;
diff --git a/src/include/gnunet_chat_service.h b/src/include/gnunet_chat_service.h
index 5eb0daf3f..938b43423 100644
--- a/src/include/gnunet_chat_service.h
+++ b/src/include/gnunet_chat_service.h
@@ -20,7 +20,7 @@
 
 /**
  * @file include/gnunet_chat_service.h
- * @brief API for chatting via GNUnet 
+ * @brief API for chatting via GNUnet
  * @author Christian Grothoff
  * @author Nathan Evans
  * @author Vitaly Minko
diff --git a/src/include/gnunet_client_lib.h b/src/include/gnunet_client_lib.h
index ed033d031..64892de0f 100644
--- a/src/include/gnunet_client_lib.h
+++ b/src/include/gnunet_client_lib.h
@@ -163,7 +163,7 @@ GNUNET_CLIENT_notify_transmit_ready (struct GNUNET_CLIENT_Connection *sock,
 
 /**
  * Cancel a request for notification.
- * 
+ *
  * @param th handle from the original request.
  */
 void
@@ -188,7 +188,7 @@ GNUNET_CLIENT_notify_transmit_ready_cancel (struct GNUNET_CLIENT_TransmitHandle
  *        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/include/gnunet_common.h b/src/include/gnunet_common.h
index 2636824d3..b8a667524 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -235,7 +235,7 @@ GNUNET_logger_remove (GNUNET_Logger logger, void *logger_cls);
  * NOT reentrant!
  *
  * @param hc the hash code
- * @return string 
+ * @return string
  */
 const char *
 GNUNET_h2s (const GNUNET_HashCode * hc);
@@ -368,7 +368,7 @@ GNUNET_htonll (unsigned long long n);
 
 /**
  * Allocate and initialize a block of memory.
- * 
+ *
  * @param buf data to initalize the block with
  * @param size the number of bytes in buf (and size of the allocation)
  * @return pointer to size bytes of memory, never NULL (!)
diff --git a/src/include/gnunet_connection_lib.h b/src/include/gnunet_connection_lib.h
index f7a6e5078..7ee3c109d 100644
--- a/src/include/gnunet_connection_lib.h
+++ b/src/include/gnunet_connection_lib.h
@@ -232,7 +232,7 @@ GNUNET_CONNECTION_get_address (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/include/gnunet_constants.h b/src/include/gnunet_constants.h
index da408bf55..190cabbb0 100644
--- a/src/include/gnunet_constants.h
+++ b/src/include/gnunet_constants.h
@@ -69,7 +69,7 @@ extern "C"
 #define GNUNET_CONSTANTS_EXEC_WAIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 200)
 
 /**
- * After how long do we retry a service connection that was 
+ * After how long do we retry a service connection that was
  * unavailable?  Used in cases where an exponential back-off
  * seems inappropriate.
  */
@@ -99,13 +99,13 @@ extern "C"
 
 /**
  * Size of the 'struct EncryptedMessage' of the core (which
- * is the per-message overhead of the core).  
+ * is the per-message overhead of the core).
  */
 #define GNUNET_CONSTANTS_CORE_SIZE_ENCRYPTED_MESSAGE (24 + sizeof (GNUNET_HashCode))
 
 /**
- * Size of the 'struct OutboundMessage' of the transport 
- * (which, in combination with the 
+ * Size of the 'struct OutboundMessage' of the transport
+ * (which, in combination with the
  * GNUNET_CONSTANTS_CORE_SIZE_ENCRYPTED_MESSAGE) defines
  * the headers that must be pre-pendable to all GNUnet
  * messages.  Taking GNUNET_SERVER_MAX_MESSAGE_SIZE
@@ -123,7 +123,7 @@ extern "C"
  *
  * Could theoretically be 64k minus (GNUNET_CONSTANTS_CORE_SIZE_ENCRYPTED_MESSAGE +
  * GNUNET_CONSTANTS_TRANSPORT_SIZE_OUTBOUND_MESSAGE), but we're going
- * to be more conservative for now. 
+ * to be more conservative for now.
  */
 #define GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE (63 * 1024)
 
diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h
index cad85d016..0c7f60a7a 100644
--- a/src/include/gnunet_container_lib.h
+++ b/src/include/gnunet_container_lib.h
@@ -239,7 +239,7 @@ struct GNUNET_CONTAINER_MetaData;
 
 /**
  * Create a fresh MetaData token.
- * 
+ *
  * @return empty meta-data container
  */
 struct GNUNET_CONTAINER_MetaData *
@@ -247,7 +247,7 @@ GNUNET_CONTAINER_meta_data_create (void);
 
 /**
  * Duplicate a MetaData token.
- * 
+ *
  * @param md what to duplicate
  * @return duplicate meta-data container
  */
@@ -289,7 +289,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
@@ -999,7 +999,7 @@ GNUNET_CONTAINER_heap_remove_root (struct GNUNET_CONTAINER_Heap *heap);
 
 /**
  * Removes a node from the heap.
- * 
+ *
  * @param node node to remove
  * @return element data stored at the node, NULL if heap is empty
  */
@@ -1047,12 +1047,12 @@ enum GNUNET_CONTAINER_SListDisposition
 
 
 /**
- * Handle to a singly linked list  
+ * Handle to a singly linked list
  */
 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/include/gnunet_core_service.h b/src/include/gnunet_core_service.h
index 083276804..0fcff6d6f 100644
--- a/src/include/gnunet_core_service.h
+++ b/src/include/gnunet_core_service.h
@@ -201,7 +201,7 @@ typedef void (*GNUNET_CORE_StartupCallback) (void *cls,
  *                can be used to improve efficiency, ignored if inbound_notify is NULL
  *                note that the core is allowed to drop notifications about inbound
  *                messages if the client does not process them fast enough (for this
- *                notification type, a bounded queue is used) 
+ *                notification type, a bounded queue is used)
  * @param outbound_notify function to call for all outbound messages, can be NULL;
  *                note that the core is allowed to drop notifications about outbound
  *                messages if the client does not process them fast enough (for this
@@ -234,7 +234,7 @@ GNUNET_CORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
 
 
 /**
- * Disconnect from the core service.    This function can only 
+ * Disconnect from the core service.    This function can only
  * be called *after* all pending 'GNUNET_CORE_notify_transmit_ready'
  * requests have been explicitly cancelled.
  *
@@ -371,7 +371,7 @@ GNUNET_CORE_peer_change_preference (struct GNUNET_CORE_Handle *h,
 /**
  * Cancel request for getting information about a peer.
  * Note that an eventual change in preference, trust or bandwidth
- * assignment MAY have already been committed at the time, 
+ * assignment MAY have already been committed at the time,
  * so cancelling a request is NOT sure to undo the original
  * request.  The original request may or may not still commit.
  * The only thing cancellation ensures is that the callback
@@ -429,7 +429,7 @@ struct GNUNET_CORE_TransmitHandle;
  * given number of bytes to the specified "target".   Must only be
  * called after a connection to the respective peer has been
  * established (and the client has been informed about this).
- * 
+ *
  *
  * @param handle connection to core service
  * @param cork is corking allowed for this transmission?
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
index d5a1685d1..f97b351c9 100644
--- a/src/include/gnunet_crypto_lib.h
+++ b/src/include/gnunet_crypto_lib.h
@@ -247,7 +247,7 @@ GNUNET_CRYPTO_random_u32 (enum GNUNET_CRYPTO_Quality mode, uint32_t i);
 
 
 /**
- * Random on unsigned 64-bit values. 
+ * Random on unsigned 64-bit values.
  *
  * @param mode desired quality of the random number
  * @param max value returned will be in range [0,max) (exclusive)
@@ -471,7 +471,7 @@ GNUNET_CRYPTO_hash_create_random (enum GNUNET_CRYPTO_Quality mode,
  *
  * @param a some hash code
  * @param b some hash code
- * @param result set to b - a 
+ * @param result set to b - a
  */
 void
 GNUNET_CRYPTO_hash_difference (const GNUNET_HashCode * a,
@@ -497,7 +497,7 @@ GNUNET_CRYPTO_hash_sum (const GNUNET_HashCode * a,
  *
  * @param a some hash code
  * @param b some hash code
- * @param result set to a ^ b 
+ * @param result set to a ^ b
  */
 void
 GNUNET_CRYPTO_hash_xor (const GNUNET_HashCode * a, const GNUNET_HashCode * b,
@@ -693,7 +693,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.
@@ -807,7 +807,7 @@ GNUNET_CRYPTO_rsa_verify (uint32_t purpose,
 /**
  * This function should only be called in testcases
  * where strong entropy gathering is not desired
- * (for example, for hostkey generation). 
+ * (for example, for hostkey generation).
  */
 void
 GNUNET_CRYPTO_random_disable_entropy_gathering (void);
diff --git a/src/include/gnunet_datacache_plugin.h b/src/include/gnunet_datacache_plugin.h
index 6868d6b76..fbfcdf1e8 100644
--- a/src/include/gnunet_datacache_plugin.h
+++ b/src/include/gnunet_datacache_plugin.h
@@ -40,7 +40,7 @@ extern "C"
 /**
  * Function called by plugins to notify the datacache
  * about content deletions.
- * 
+ *
  * @param cls closure
  * @param key key of the content that was deleted
  * @param size number of bytes that were made available
@@ -133,7 +133,7 @@ struct GNUNET_DATACACHE_PluginFunctions
   /**
    * Delete the entry with the lowest expiration value
    * from the datacache right now.
-   * 
+   *
    * @param cls closure (internal context for the plugin)
    * @return GNUNET_OK on success, GNUNET_SYSERR on error
    */
diff --git a/src/include/gnunet_datastore_plugin.h b/src/include/gnunet_datastore_plugin.h
index b0aa0c6c9..fb1dff51d 100644
--- a/src/include/gnunet_datastore_plugin.h
+++ b/src/include/gnunet_datastore_plugin.h
@@ -45,7 +45,7 @@
  * changes.
  *
  * @param cls closure
- * @param delta change in disk utilization, 
+ * @param delta change in disk utilization,
  *        0 for "reset to empty"
  */
 typedef void (*DiskUtilizationChange) (void *cls, int delta);
@@ -138,7 +138,7 @@ typedef int (*PluginPut) (void *cls, const GNUNET_HashCode * key, uint32_t size,
  * Get one of the results for a particular key in the datastore.
  *
  * @param cls closure
- * @param offset offset of the result (modulo num-results); 
+ * @param offset offset of the result (modulo num-results);
  *               specific ordering does not matter for the offset
  * @param key key to match, never NULL
  * @param vhash hash of the value, maybe NULL (to
@@ -148,7 +148,7 @@ typedef int (*PluginPut) (void *cls, const GNUNET_HashCode * key, uint32_t size,
  *        there may be!
  * @param type entries of which type are relevant?
  *     Use 0 for any type.
- * @param proc function to call on the matching value; 
+ * @param proc function to call on the matching value;
  *        proc should be called with NULL if there is no result
  * @param proc_cls closure for proc
  */
@@ -203,10 +203,10 @@ typedef int (*PluginUpdate) (void *cls, uint64_t uid, int delta,
 
 /**
  * Select a single item from the datastore at the specified offset
- * (among those applicable). 
+ * (among those applicable).
  *
  * @param cls closure
- * @param offset offset of the result (modulo num-results); 
+ * @param offset offset of the result (modulo num-results);
  *               specific ordering does not matter for the offset
  * @param type entries of which type should be considered?
  *        Must not be zero (ANY).
diff --git a/src/include/gnunet_datastore_service.h b/src/include/gnunet_datastore_service.h
index 3d2cc35c9..03ec9117c 100644
--- a/src/include/gnunet_datastore_service.h
+++ b/src/include/gnunet_datastore_service.h
@@ -371,7 +371,7 @@ GNUNET_DATASTORE_get_for_replication (struct GNUNET_DATASTORE_Handle *h,
 /**
  * Cancel a datastore operation.  The final callback from the
  * operation must not have been done yet.
- * 
+ *
  * @param qe operation to cancel
  */
 void
diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h
index abca17370..5f6a37840 100644
--- a/src/include/gnunet_disk_lib.h
+++ b/src/include/gnunet_disk_lib.h
@@ -103,37 +103,37 @@ enum GNUNET_DISK_OpenFlags
 {
 
     /**
-     * Open the file for reading 
+     * Open the file for reading
      */
   GNUNET_DISK_OPEN_READ = 1,
 
     /**
-     * Open the file for writing 
+     * Open the file for writing
      */
   GNUNET_DISK_OPEN_WRITE = 2,
 
     /**
-     * Open the file for both reading and writing 
+     * Open the file for both reading and writing
      */
   GNUNET_DISK_OPEN_READWRITE = 3,
 
     /**
-     * Fail if file already exists 
+     * Fail if file already exists
      */
   GNUNET_DISK_OPEN_FAILIFEXISTS = 4,
 
     /**
-     * Truncate file if it exists 
+     * Truncate file if it exists
      */
   GNUNET_DISK_OPEN_TRUNCATE = 8,
 
     /**
-     * Create file if it doesn't exist 
+     * Create file if it doesn't exist
      */
   GNUNET_DISK_OPEN_CREATE = 16,
 
     /**
-     * Append to the file 
+     * Append to the file
      */
   GNUNET_DISK_OPEN_APPEND = 32
 };
@@ -342,7 +342,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
@@ -463,7 +463,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
diff --git a/src/include/gnunet_fragmentation_lib.h b/src/include/gnunet_fragmentation_lib.h
index 06022e093..a953bd2b1 100644
--- a/src/include/gnunet_fragmentation_lib.h
+++ b/src/include/gnunet_fragmentation_lib.h
@@ -154,7 +154,7 @@ typedef void (*GNUNET_DEFRAGMENT_AckProcessor) (void *cls, uint32_t id,
  * Create a defragmentation context.
  *
  * @param stats statistics context
- * @param mtu the maximum message size for each fragment 
+ * @param mtu the maximum message size for each fragment
  * @param num_msgs how many fragmented messages
  *                 to we defragment at most at the same time?
  * @param cls closure for proc and ackp
diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h
index e8026a66f..7bfb15ac0 100644
--- a/src/include/gnunet_fs_service.h
+++ b/src/include/gnunet_fs_service.h
@@ -19,7 +19,7 @@
 */
 /**
  * @file include/gnunet_fs_service.h
- * @brief API for file-sharing via GNUnet 
+ * @brief API for file-sharing via GNUnet
  * @author Christian Grothoff
  */
 #ifndef GNUNET_FS_LIB_H
@@ -105,7 +105,7 @@ GNUNET_FS_uri_to_string (const struct GNUNET_FS_Uri *uri);
  * Convert keyword URI to a human readable format
  * (i.e. the search query that was used in the first place)
  *
- * @param uri ksk uri to convert to a string 
+ * @param uri ksk uri to convert to a string
  * @return string with the keywords
  */
 char *
@@ -232,7 +232,7 @@ GNUNET_FS_uri_loc_create (const struct GNUNET_FS_Uri *baseUri,
  * as decapitalization and removal of certain characters.
  * (useful for search).
  *
- * @param uri the URI to canonicalize 
+ * @param uri the URI to canonicalize
  * @return canonicalized version of the URI, NULL on error
  */
 struct GNUNET_FS_Uri *
@@ -490,13 +490,13 @@ GNUNET_FS_getopt_set_metadata (struct GNUNET_GETOPT_CommandLineProcessorContext
 
 
 /**
- * Possible status codes used in the callback for the 
+ * Possible status codes used in the callback for the
  * various file-sharing operations.  On each file (or search),
  * the callback is guaranteed to be called once with "START"
  * and once with STOPPED; calls with PROGRESS, ERROR or COMPLETED
  * are optional and depend on the circumstances; parent operations
  * will be STARTED before child-operations and STOPPED after
- * their respective child-operations.  START and STOP signals 
+ * their respective child-operations.  START and STOP signals
  * are typically generated either due to explicit client requests
  * or because of suspend/resume operations.
  */
@@ -602,7 +602,7 @@ enum GNUNET_FS_Status
   GNUNET_FS_STATUS_DOWNLOAD_LOST_PARENT,
 
   /**
-   * First event generated when a client requests 
+   * First event generated when a client requests
    * a search to begin or when a namespace result
    * automatically triggers the search for updates.
    */
@@ -807,7 +807,7 @@ struct GNUNET_FS_ProgressInfo
       /**
        * How large is the file overall?  For directories,
        * this is only the size of the directory itself,
-       * not of the other files contained within the 
+       * not of the other files contained within the
        * directory.
        */
       uint64_t size;
@@ -864,7 +864,7 @@ struct GNUNET_FS_ProgressInfo
           uint64_t data_len;
 
           /**
-           * Depth of the given block in the tree; 
+           * Depth of the given block in the tree;
            * 0 would be the lowest level (DBLOCKs).
            */
           unsigned int depth;
@@ -950,7 +950,7 @@ struct GNUNET_FS_ProgressInfo
       /**
        * Client context pointer for the associated search operation
        * (specifically, context pointer for the specific search
-       * result, not the overall search); only set if this 
+       * result, not the overall search); only set if this
        * download was started from a search result.
        */
       void *sctx;
@@ -1031,7 +1031,7 @@ struct GNUNET_FS_ProgressInfo
           uint64_t data_len;
 
           /**
-           * Depth of the given block in the tree; 
+           * Depth of the given block in the tree;
            * 0 would be the lowest level (DBLOCKS).
            */
           unsigned int depth;
@@ -1266,7 +1266,7 @@ struct GNUNET_FS_ProgressInfo
          * These values are only valid for
          * GNUNET_FS_STATUS_SEARCH_RESULT_SUSPEND events.
          * These events are automatically triggered for
-         * each search result before the 
+         * each search result before the
          * GNUNET_FS_STATUS_SEARCH_SUSPEND event.  This
          * happens primarily to give the client a chance
          * to clean up the "cctx" (if needed).
@@ -1296,7 +1296,7 @@ struct GNUNET_FS_ProgressInfo
          * These values are only valid for
          * GNUNET_FS_STATUS_SEARCH_RESULT_STOPPED events.
          * These events are automatically triggered for
-         * each search result before the 
+         * each search result before the
          * GNUNET_FS_STATUS_SEARCH_STOPPED event.  This
          * happens primarily to give the client a chance
          * to clean up the "cctx" (if needed).
@@ -1468,7 +1468,7 @@ struct GNUNET_FS_ProgressInfo
           uint64_t data_len;
 
           /**
-           * Depth of the given block in the tree; 
+           * Depth of the given block in the tree;
            * 0 would be the lowest level (DBLOCKS).
            */
           unsigned int depth;
@@ -1518,9 +1518,9 @@ struct GNUNET_FS_ProgressInfo
 
 
 /**
- * Notification of FS to a client about the progress of an 
+ * Notification of FS to a client about the progress of an
  * operation.  Callbacks of this type will be used for uploads,
- * downloads and searches.  Some of the arguments depend a bit 
+ * downloads and searches.  Some of the arguments depend a bit
  * in their meaning on the context in which the callback is used.
  *
  * @param cls closure
@@ -1661,7 +1661,7 @@ struct GNUNET_FS_Handle;
  * Setup a connection to the file-sharing service.
  *
  * @param cfg configuration to use
- * @param client_name unique identifier for this client 
+ * @param client_name unique identifier for this client
  * @param upcb function to call to notify about FS actions
  * @param upcb_cls closure for upcb
  * @param flags specific attributes for fs-operations
@@ -1806,7 +1806,7 @@ GNUNET_FS_file_information_create_from_data (struct GNUNET_FS_Handle *h,
  * @param offset offset to read from; it is possible
  *            that the caller might need to go backwards
  *            a bit at times
- * @param max maximum number of bytes that should be 
+ * @param max maximum number of bytes that should be
  *            copied to buf; readers are not allowed
  *            to provide less data unless there is an error;
  *            a value of "0" will be used at the end to allow
@@ -1825,7 +1825,7 @@ typedef size_t (*GNUNET_FS_DataReader) (void *cls, uint64_t offset, size_t max,
  * @param h handle to the file sharing subsystem
  * @param client_info initial client-info value for this entry
  * @param length length of the file
- * @param reader function that can be used to obtain the data for the file 
+ * @param reader function that can be used to obtain the data for the file
  * @param reader_cls closure for "reader"
  * @param keywords under which keywords should this file be available
  *         directly; can be NULL
@@ -1855,7 +1855,7 @@ GNUNET_FS_file_information_create_from_reader (struct GNUNET_FS_Handle *h,
  * for each entry in the directory.
  *
  * @param cls closure
- * @param filename name of the file (including path); must end 
+ * @param filename name of the file (including path); must end
  *          in a "/" (even on W32) if this is a directory
  * @param fi information about the file (should not be
  *        used henceforth by the caller)
@@ -1866,7 +1866,7 @@ typedef void (*GNUNET_FS_FileProcessor) (void *cls, const char *filename,
 
 /**
  * Type of a function that will be used to scan a directory.
- * 
+ *
  * @param cls closure
  * @param h handle to the file sharing subsystem
  * @param dirname name of the directory to scan
@@ -1991,7 +1991,7 @@ GNUNET_FS_file_information_is_directory (const struct GNUNET_FS_FileInformation
  *
  * @param dir the directory
  * @param ent the entry to add; the entry must not have been
- *            added to any other directory at this point and 
+ *            added to any other directory at this point and
  *            must not include "dir" in its structure
  * @return GNUNET_OK on success, GNUNET_SYSERR on error
  */
@@ -2062,9 +2062,9 @@ enum GNUNET_FS_PublishOptions
  * @param namespace namespace to publish the file in, NULL for no namespace
  * @param nid identifier to use for the publishd content in the namespace
  *        (can be NULL, must be NULL if namespace is NULL)
- * @param nuid update-identifier that will be used for future updates 
+ * @param nuid update-identifier that will be used for future updates
  *        (can be NULL, must be NULL if namespace or nid is NULL)
- * @param options options for the publication 
+ * @param options options for the publication
  * @return context that can be used to control the publish operation
  */
 struct GNUNET_FS_PublishContext *
@@ -2076,7 +2076,7 @@ GNUNET_FS_publish_start (struct GNUNET_FS_Handle *h,
 
 
 /**
- * Stop a publication.  Will abort incomplete publications (but 
+ * Stop a publication.  Will abort incomplete publications (but
  * not remove blocks that have already been published) or
  * simply clean up the state for completed publications.
  * Must NOT be called from within the event callback!
@@ -2183,7 +2183,7 @@ GNUNET_FS_get_indexed_files (struct GNUNET_FS_Handle *h,
  * @param h handle to the file sharing subsystem
  * @param filename file to unindex
  * @param cctx initial value for the client context
- * @return NULL on error, otherwise handle 
+ * @return NULL on error, otherwise handle
  */
 struct GNUNET_FS_UnindexContext *
 GNUNET_FS_unindex_start (struct GNUNET_FS_Handle *h, const char *filename,
@@ -2200,7 +2200,7 @@ GNUNET_FS_unindex_stop (struct GNUNET_FS_UnindexContext *uc);
 
 
 /**
- * Publish an advertismement for a namespace.  
+ * Publish an advertismement for a namespace.
  *
  * @param h handle to the file sharing subsystem
  * @param ksk_uri keywords to use for advertisment
@@ -2280,7 +2280,7 @@ GNUNET_FS_namespace_list (struct GNUNET_FS_Handle *h,
  * Function called on updateable identifiers.
  *
  * @param cls closure
- * @param last_id last identifier 
+ * @param last_id last identifier
  * @param last_uri uri used for the content published under the last_id
  * @param last_meta metadata associated with last_uri
  * @param next_id identifier that should be used for updates
@@ -2298,12 +2298,12 @@ typedef void (*GNUNET_FS_IdentifierProcessor) (void *cls, const char *last_id,
  * produce an update.  Namespace updates form a graph where each node
  * has a name.  Each node can have any number of URI/meta-data entries
  * which can each be linked to other nodes.  Cycles are possible.
- * 
+ *
  * Calling this function with "next_id" NULL will cause the library to
  * call "ip" with a root for each strongly connected component of the
  * graph (a root being a node from which all other nodes in the Scc
  * are reachable).
- * 
+ *
  * Calling this function with "next_id" being the name of a node will
  * cause the library to call "ip" with all children of the node.  Note
  * that cycles within an SCC are possible (including self-loops).
@@ -2356,7 +2356,7 @@ GNUNET_FS_search_start (struct GNUNET_FS_Handle *h,
 
 
 /**
- * Pause search.  
+ * Pause search.
  *
  * @param sc context for the search that should be paused
  */
@@ -2541,7 +2541,7 @@ GNUNET_FS_meta_data_test_for_directory (const struct GNUNET_CONTAINER_MetaData
 /**
  * Set the MIMETYPE information for the given
  * metadata to "application/gnunet-directory".
- * 
+ *
  * @param md metadata to add mimetype to
  */
 void
@@ -2550,7 +2550,7 @@ GNUNET_FS_meta_data_make_directory (struct GNUNET_CONTAINER_MetaData *md);
 
 /**
  * Suggest a filename based on given metadata.
- * 
+ *
  * @param md given meta data
  * @return NULL if meta data is useless for suggesting a filename
  */
@@ -2617,7 +2617,7 @@ struct GNUNET_FS_DirectoryBuilder;
 
 /**
  * Create a directory builder.
- * 
+ *
  * @param mdir metadata for the directory
  */
 struct GNUNET_FS_DirectoryBuilder *
@@ -2627,7 +2627,7 @@ GNUNET_FS_directory_builder_create (const struct GNUNET_CONTAINER_MetaData
 
 /**
  * Add an entry to a directory.
- * 
+ *
  * @param bld directory to extend
  * @param uri uri of the entry (must not be a KSK)
  * @param md metadata of the entry
diff --git a/src/include/gnunet_getopt_lib.h b/src/include/gnunet_getopt_lib.h
index e6afa2b3c..2f4f4c32b 100644
--- a/src/include/gnunet_getopt_lib.h
+++ b/src/include/gnunet_getopt_lib.h
@@ -250,7 +250,7 @@ GNUNET_GETOPT_set_uint (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx,
 
 
 /**
- * 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
@@ -261,7 +261,7 @@ GNUNET_GETOPT_set_uint (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx,
  * @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,
@@ -280,7 +280,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,
@@ -298,7 +298,7 @@ GNUNET_GETOPT_set_string (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx,
  * @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
diff --git a/src/include/gnunet_hello_lib.h b/src/include/gnunet_hello_lib.h
index 556b41d3c..0ec1be7d1 100644
--- a/src/include/gnunet_hello_lib.h
+++ b/src/include/gnunet_hello_lib.h
@@ -130,9 +130,9 @@ GNUNET_HELLO_merge (const struct GNUNET_HELLO_Message *h1,
  * @param h2 the second HELLO message
  * @param now time to use for deciding which addresses have
  *            expired and should not be considered at all
- * @return absolute time forever if the two HELLOs are 
+ * @return absolute time forever if the two HELLOs are
  *         totally identical; smallest timestamp >= now if
- *         they only differ in timestamps; 
+ *         they only differ in timestamps;
  *         zero if the some addresses with expirations >= now
  *         do not match at all
  */
diff --git a/src/include/gnunet_mesh_service.h b/src/include/gnunet_mesh_service.h
index bea706478..bf43c8289 100644
--- a/src/include/gnunet_mesh_service.h
+++ b/src/include/gnunet_mesh_service.h
@@ -135,7 +135,7 @@ typedef uint32_t GNUNET_MESH_ApplicationType;
  *                messages if the client does not process them fast enough (for this
  *                notification type, a bounded queue is used)
  * @param stypes Application Types the client claims to offer
- * @return handle to the mesh service 
+ * @return handle to the mesh service
  *           NULL on error (in this case, init is never called)
  */
 struct GNUNET_MESH_Handle *
@@ -146,7 +146,7 @@ GNUNET_MESH_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, void *cls,
 
 /**
  * Get the peer on the other side of this tunnel if it is just one. Return NULL otherwise
- * 
+ *
  * @param tunnel the tunnel
  * @return the peer or NULL
  */
@@ -309,7 +309,7 @@ GNUNET_MESH_peer_request_connect_by_type (struct GNUNET_MESH_Handle *h,
 
 /**
  * Cancel a pending request to connect to a particular peer.  Destroys the
- * tunnel. 
+ * tunnel.
  *
  * @param req request handle that was returned for the original request
  */
@@ -333,7 +333,7 @@ struct GNUNET_MESH_TransmitHandle;
  * @param cork is corking allowed for this transmission?
  * @param priority how important is the message?
  * @param maxdelay how long can the message wait?
- * @param target destination for the message, NULL for multicast to all tunnel targets 
+ * @param target destination for the message, NULL for multicast to all tunnel targets
  * @param notify_size how many bytes of buffer space does notify want?
  * @param notify function to call when buffer space is available;
  *        will be called with NULL on timeout or if the overall queue
diff --git a/src/include/gnunet_mesh_service_new.h b/src/include/gnunet_mesh_service_new.h
index 83addfce5..d0be4ee77 100644
--- a/src/include/gnunet_mesh_service_new.h
+++ b/src/include/gnunet_mesh_service_new.h
@@ -257,14 +257,14 @@ struct GNUNET_MESH_TransmitHandle;
 
 /**
  * Ask the mesh to call "notify" once it is ready to transmit the
- * given number of bytes to the specified tunnel or target. 
+ * given number of bytes to the specified tunnel or target.
  *
  * @param tunnel tunnel to use for transmission
  * @param cork is corking allowed for this transmission?
  * @param priority how important is the message?
  * @param maxdelay how long can the message wait?
  * @param target destination for the message
- *               NULL for multicast to all tunnel targets 
+ *               NULL for multicast to all tunnel targets
  * @param notify_size how many bytes of buffer space does notify want?
  * @param notify function to call when buffer space is available;
  *        will be called with NULL on timeout or if the overall queue
diff --git a/src/include/gnunet_nat_lib.h b/src/include/gnunet_nat_lib.h
index c521a560c..6c1db8043 100644
--- a/src/include/gnunet_nat_lib.h
+++ b/src/include/gnunet_nat_lib.h
@@ -84,7 +84,7 @@ struct GNUNET_NAT_Handle;
  * @param reversal_callback function to call if someone wants connection reversal from us,
  *        NULL if connection reversal is not supported
  * @param callback_cls closure for callback
- * @return NULL on error, otherwise handle that can be used to unregister 
+ * @return NULL on error, otherwise handle that can be used to unregister
  */
 struct GNUNET_NAT_Handle *
 GNUNET_NAT_register (const struct GNUNET_CONFIGURATION_Handle *cfg, int is_tcp,
@@ -145,7 +145,7 @@ struct GNUNET_NAT_Test;
  *
  * @param cls closure
  * @param success GNUNET_OK on success, GNUNET_NO on failure,
- *                GNUNET_SYSERR if the test could not be 
+ *                GNUNET_SYSERR if the test could not be
  *                properly started (internal failure)
  */
 typedef void (*GNUNET_NAT_TestCallback) (void *cls, int success);
@@ -227,7 +227,7 @@ struct GNUNET_NAT_MiniHandle;
  * general-purpose 'GNUNET_NAT_register' code).  However, it can be
  * used if specifically UPnP-based NAT traversal is to be used or
  * tested.
- * 
+ *
  * @param port port to map
  * @param is_tcp GNUNET_YES to map TCP, GNUNET_NO for UDP
  * @param ac function to call with mapping result
@@ -244,7 +244,7 @@ GNUNET_NAT_mini_map_start (uint16_t port, int is_tcp,
  * this function will give 'upnpc' 1s to remove tha mapping,
  * so while this function is non-blocking, a task will be
  * left with the scheduler for up to 1s past this call.
- * 
+ *
  * @param mini the handle
  */
 void
diff --git a/src/include/gnunet_nse_service.h b/src/include/gnunet_nse_service.h
index 451f2a2dc..a0c6016a4 100644
--- a/src/include/gnunet_nse_service.h
+++ b/src/include/gnunet_nse_service.h
@@ -70,7 +70,7 @@ typedef void (*GNUNET_NSE_Callback) (void *cls,
  * Convert the logarithmic estimated returned to the 'GNUNET_NSE_Callback'
  * into an absolute estimate in terms of the number of peers in the network.
  *
- * @param loge logarithmic estimate 
+ * @param loge logarithmic estimate
  * @return absolute number of peers in the network (estimated)
  */
 #define GNUNET_NSE_log_estimate_to_n(loge) pow(2.0, (loge))
diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h
index 9d611af9b..31062bd40 100644
--- a/src/include/gnunet_os_lib.h
+++ b/src/include/gnunet_os_lib.h
@@ -356,7 +356,7 @@ GNUNET_OS_install_parent_control_handler (void *cls,
  * 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/include/gnunet_peer_lib.h b/src/include/gnunet_peer_lib.h
index 89413aa59..0121e8453 100644
--- a/src/include/gnunet_peer_lib.h
+++ b/src/include/gnunet_peer_lib.h
@@ -80,7 +80,7 @@ GNUNET_PEER_change_rc (GNUNET_PEER_Id id, int delta);
 
 /**
  * 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/include/gnunet_peerinfo_service.h b/src/include/gnunet_peerinfo_service.h
index 50bbc458a..158eae602 100644
--- a/src/include/gnunet_peerinfo_service.h
+++ b/src/include/gnunet_peerinfo_service.h
@@ -73,7 +73,7 @@ GNUNET_PEERINFO_disconnect (struct GNUNET_PEERINFO_Handle *h);
 
 
 /**
- * Add a host to the persistent list.  This method operates in 
+ * Add a host to the persistent list.  This method operates in
  * semi-reliable mode: if the transmission is not completed by
  * the time 'GNUNET_PEERINFO_disconnect' is called, it will be
  * aborted.  Furthermore, if a second HELLO is added for the
@@ -116,15 +116,15 @@ struct GNUNET_PEERINFO_IteratorContext;
  * host and then finally once with a NULL pointer.  After that final
  * invocation, the iterator context must no longer be used.
  *
- * Instead of calling this function with 'peer == NULL' 
+ * Instead of calling this function with 'peer == NULL'
  * it is often better to use 'GNUNET_PEERINFO_notify'.
- * 
+ *
  * @param h handle to the peerinfo service
  * @param peer restrict iteration to this peer only (can be NULL)
  * @param timeout how long to wait until timing out
  * @param callback the method to call for each peer
  * @param callback_cls closure for callback
- * @return NULL on error (in this case, 'callback' is never called!), 
+ * @return NULL on error (in this case, 'callback' is never called!),
  *         otherwise an iterator context
  */
 struct GNUNET_PEERINFO_IteratorContext *
diff --git a/src/include/gnunet_plugin_lib.h b/src/include/gnunet_plugin_lib.h
index fbc7e2617..d143a6ccf 100644
--- a/src/include/gnunet_plugin_lib.h
+++ b/src/include/gnunet_plugin_lib.h
@@ -54,7 +54,7 @@ typedef void *(*GNUNET_PLUGIN_Callback) (void *arg);
  * 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/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index c12a849ce..5f3ab25ce 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -36,7 +36,7 @@ extern "C"
 #endif
 
 /*******************************************************************************
- * UTIL message types 
+ * UTIL message types
  ******************************************************************************/
 
 /**
@@ -45,7 +45,7 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_TEST 1
 
 /*******************************************************************************
- * RESOLVER message types 
+ * RESOLVER message types
  ******************************************************************************/
 
 /**
@@ -59,7 +59,7 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE 5
 
 /*******************************************************************************
- * ARM message types 
+ * ARM message types
  ******************************************************************************/
 
 /**
@@ -100,7 +100,7 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_ARM_SHUTDOWN_ACK 14
 
 /*******************************************************************************
- * HELLO message types 
+ * HELLO message types
  ******************************************************************************/
 
 /**
@@ -110,7 +110,7 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_HELLO 16
 
 /*******************************************************************************
- * FRAGMENTATION message types 
+ * FRAGMENTATION message types
  ******************************************************************************/
 
 /**
@@ -126,7 +126,7 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_FRAGMENT_ACK 19
 
 /*******************************************************************************
- * TRANSPORT message types 
+ * TRANSPORT message types
  ******************************************************************************/
 
 /**
@@ -242,7 +242,7 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE 39
 
 /*******************************************************************************
- * Transport-WLAN message types 
+ * Transport-WLAN message types
  ******************************************************************************/
 
 /**
@@ -269,7 +269,7 @@ extern "C"
 
 
 /*******************************************************************************
- * Transport-DV message types 
+ * Transport-DV message types
  ******************************************************************************/
 
 /**
@@ -313,7 +313,7 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_DV_DISCONNECT 50
 
 /*******************************************************************************
- * Transport-UDP message types 
+ * Transport-UDP message types
  ******************************************************************************/
 
 /**
@@ -327,7 +327,7 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_ACK 57
 
 /*******************************************************************************
- * Transport-TCP message types 
+ * Transport-TCP message types
  ******************************************************************************/
 
 /**
@@ -347,7 +347,7 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_ATS 62
 
 /*******************************************************************************
- * NAT message types 
+ * NAT message types
  ******************************************************************************/
 
 /**
@@ -356,7 +356,7 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_NAT_TEST 63
 
 /*******************************************************************************
- * CORE message types 
+ * CORE message types
  ******************************************************************************/
 
 /**
@@ -484,7 +484,7 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_CORE_BINARY_TYPE_MAP 87
 
 /*******************************************************************************
- * DATASTORE message types 
+ * DATASTORE message types
  ******************************************************************************/
 
 /**
@@ -554,7 +554,7 @@ extern "C"
 
 
 /*******************************************************************************
- * FS message types 
+ * FS message types
  ******************************************************************************/
 
 /**
@@ -621,7 +621,7 @@ extern "C"
 
 
 /*******************************************************************************
- * DHT message types 
+ * DHT message types
  ******************************************************************************/
 
 /**
@@ -706,7 +706,7 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_DROP  156
 
 /*******************************************************************************
- * HOSTLIST message types 
+ * HOSTLIST message types
  ******************************************************************************/
 
 /**
@@ -716,7 +716,7 @@ extern "C"
 
 
 /*******************************************************************************
- * STATISTICS message types 
+ * STATISTICS message types
  ******************************************************************************/
 
 /**
@@ -752,7 +752,7 @@ extern "C"
 
 
 /*******************************************************************************
- * VPN message types 
+ * VPN message types
  ******************************************************************************/
 
 /**
@@ -802,7 +802,7 @@ extern "C"
 
 
 /*******************************************************************************
- * VPN-DNS message types 
+ * VPN-DNS message types
  ******************************************************************************/
 
 /**
diff --git a/src/include/gnunet_pseudonym_lib.h b/src/include/gnunet_pseudonym_lib.h
index 138375fe1..bde98ef8f 100644
--- a/src/include/gnunet_pseudonym_lib.h
+++ b/src/include/gnunet_pseudonym_lib.h
@@ -83,7 +83,7 @@ GNUNET_PSEUDONYM_add (const struct GNUNET_CONFIGURATION_Handle *cfg,
 /**
  * List all known 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/include/gnunet_scheduler_lib.h b/src/include/gnunet_scheduler_lib.h
index 0f80b9cee..9b8c57ff3 100644
--- a/src/include/gnunet_scheduler_lib.h
+++ b/src/include/gnunet_scheduler_lib.h
@@ -256,7 +256,7 @@ GNUNET_SCHEDULER_get_load (enum GNUNET_SCHEDULER_Priority p);
 
 /**
  * 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
diff --git a/src/include/gnunet_server_lib.h b/src/include/gnunet_server_lib.h
index 45da3efa2..682a265ff 100644
--- a/src/include/gnunet_server_lib.h
+++ b/src/include/gnunet_server_lib.h
@@ -135,7 +135,7 @@ GNUNET_SERVER_create_with_sockets (GNUNET_CONNECTION_AccessCheck access,
  * @param access function for access control
  * @param access_cls closure for access
  * @param serverAddr address toes listen on (including port), NULL terminated array
- * @param socklen lengths of respective serverAddr 
+ * @param socklen lengths of respective serverAddr
  * @param idle_timeout after how long should we timeout idle connections?
  * @param require_found if YES, connections sending messages of unknown type
  *        will be closed
@@ -352,7 +352,7 @@ typedef void (*GNUNET_SERVER_DisconnectCallback) (void *cls,
  * Ask the server to notify us whenever a client disconnects.
  * This function is called whenever the actual network connection
  * is closed; the reference count may be zero or larger than zero
- * at this point.  If the server is destroyed before this 
+ * at this point.  If the server is destroyed before this
  * notification is explicitly cancelled, the 'callback' will
  * once be called with a 'client' argument of NULL to indicate
  * that the server itself is now gone (and that the callback
@@ -609,7 +609,7 @@ GNUNET_SERVER_mst_create (GNUNET_SERVER_MessageTokenizerCallback cb,
  *        can be NULL (will be passed back to 'cb')
  * @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/include/gnunet_statistics_service.h b/src/include/gnunet_statistics_service.h
index c246e7cda..11796d781 100644
--- a/src/include/gnunet_statistics_service.h
+++ b/src/include/gnunet_statistics_service.h
@@ -143,7 +143,7 @@ GNUNET_STATISTICS_get (struct GNUNET_STATISTICS_Handle *handle,
 
 
 /**
- * Cancel a 'get' request.  Must be called before the 'cont' 
+ * Cancel a 'get' request.  Must be called before the 'cont'
  * function is called.
  *
  * @param gh handle of the request to cancel
diff --git a/src/include/gnunet_time_lib.h b/src/include/gnunet_time_lib.h
index 1f157631f..f8afdae41 100644
--- a/src/include/gnunet_time_lib.h
+++ b/src/include/gnunet_time_lib.h
@@ -253,7 +253,7 @@ GNUNET_TIME_absolute_get_remaining (struct GNUNET_TIME_Absolute future);
 
 
 /**
- * Calculate the estimate time of arrival/completion 
+ * Calculate the estimate time of arrival/completion
  * for an operation.
  *
  * @param start when did the operation start?
@@ -363,7 +363,7 @@ GNUNET_TIME_relative_subtract (struct GNUNET_TIME_Relative a1,
 
 /**
  * Convert relative time to network byte order.
- * 
+ *
  * @param a time to convert
  * @return converted time value
  */
diff --git a/src/include/gnunet_transport_plugin.h b/src/include/gnunet_transport_plugin.h
index d7ca62219..bc5b791d5 100644
--- a/src/include/gnunet_transport_plugin.h
+++ b/src/include/gnunet_transport_plugin.h
@@ -74,9 +74,9 @@ struct SessionHeader
  * use NULL wherever a session pointer is needed.  This function
  * should be called BEFORE a potential "TransmitContinuation"
  * from the "TransmitFunction".
- * 
+ *
  * @param cls closure
- * @param peer which peer was the session for 
+ * @param peer which peer was the session for
  * @param session which session is being destoyed
  */
 typedef void (*GNUNET_TRANSPORT_SessionEnd) (void *cls,
@@ -393,14 +393,14 @@ typedef int (*GNUNET_TRANSPORT_CheckAddress) (void *cls, const void *addr,
 
 /**
  * Function called for a quick conversion of the binary address to
- * a numeric address.  Note that the caller must not free the 
+ * a numeric address.  Note that the caller must not free the
  * address and that the next call to this function is allowed
  * to override the address again.
  *
  * @param cls closure
  * @param addr binary address
  * @param addr_len length of the address
- * @return string representing the same address 
+ * @return string representing the same address
  */
 typedef const char *(*GNUNET_TRANSPORT_AddressToString) (void *cls,
                                                          const void *addr,
@@ -431,7 +431,7 @@ struct GNUNET_TRANSPORT_PluginFunctions
   /**
    * Function that can be used to force the plugin to disconnect from
    * the given peer and cancel all previous transmissions (and their
-   * continuations).  
+   * continuations).
    */
   GNUNET_TRANSPORT_DisconnectFunction disconnect;
 
diff --git a/src/include/gnunet_transport_service.h b/src/include/gnunet_transport_service.h
index 988d55784..e90acab4d 100644
--- a/src/include/gnunet_transport_service.h
+++ b/src/include/gnunet_transport_service.h
@@ -486,7 +486,7 @@ GNUNET_TRANSPORT_disconnect (struct GNUNET_TRANSPORT_Handle *handle);
 
 
 /**
- * Ask the transport service to establish a connection to 
+ * Ask the transport service to establish a connection to
  * the given peer.
  *
  * @param handle connection to transport service
@@ -621,7 +621,7 @@ GNUNET_TRANSPORT_offer_hello (struct GNUNET_TRANSPORT_Handle *handle,
  * @param cfg configuration to use
  * @param address address to convert (binary format)
  * @param addressLen number of bytes in address
- * @param numeric should (IP) addresses be displayed in numeric form 
+ * @param numeric should (IP) addresses be displayed in numeric form
  *                (otherwise do reverse DNS lookup)
  * @param nameTrans name of the transport to which the address belongs
  * @param timeout how long is the lookup allowed to take at most