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

33 files changed, 174 insertions, 174 deletions

diff --git a/src/fs/fs.c b/src/fs/fs.c
index fc1388a04..93971075a 100644
--- a/src/fs/fs.c
+++ b/src/fs/fs.c
@@ -213,7 +213,7 @@ GNUNET_FS_make_top (struct GNUNET_FS_Handle *h, SuspendSignalFunction ssf,
 
 /**
  * Destroy a top-level activity entry.
- * 
+ *
  * @param h global fs handle
  * @param top top level activity entry
  */
@@ -250,7 +250,7 @@ struct FileInfo
  * @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
@@ -333,7 +333,7 @@ GNUNET_FS_make_file_reader_context_ (const char *filename)
  * @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
@@ -363,7 +363,7 @@ GNUNET_FS_data_reader_copy_ (void *cls, uint64_t offset, size_t max, void *buf,
  * (for serialization/deserialization).
  *
  * @param h master context
- * @param ext component of the path 
+ * @param ext component of the path
  * @param ent entity identifier (or emtpy string for the directory)
  * @return NULL on error
  */
@@ -394,7 +394,7 @@ get_serialization_file_name (struct GNUNET_FS_Handle *h, const char *ext,
  * parent operation.
  *
  * @param h master context
- * @param ext component of the path 
+ * @param ext component of the path
  * @param uni name of the parent operation
  * @param ent entity identifier (or emtpy string for the directory)
  * @return NULL on error
@@ -424,7 +424,7 @@ get_serialization_file_name_in_dir (struct GNUNET_FS_Handle *h, const char *ext,
  * Return a read handle for deserialization.
  *
  * @param h master context
- * @param ext component of the path 
+ * @param ext component of the path
  * @param ent entity identifier (or emtpy string for the directory)
  * @return NULL on error
  */
@@ -447,7 +447,7 @@ get_read_handle (struct GNUNET_FS_Handle *h, const char *ext, const char *ent)
  * Return a write handle for serialization.
  *
  * @param h master context
- * @param ext component of the path 
+ * @param ext component of the path
  * @param ent entity identifier (or emtpy string for the directory)
  * @return NULL on error
  */
@@ -474,7 +474,7 @@ get_write_handle (struct GNUNET_FS_Handle *h, const char *ext, const char *ent)
  * Return a write handle for serialization.
  *
  * @param h master context
- * @param ext component of the path 
+ * @param ext component of the path
  * @param uni name of parent
  * @param ent entity identifier (or emtpy string for the directory)
  * @return NULL on error
@@ -499,8 +499,8 @@ get_write_handle_in_dir (struct GNUNET_FS_Handle *h, const char *ext,
  * Remove serialization/deserialization file from disk.
  *
  * @param h master context
- * @param ext component of the path 
- * @param ent entity identifier 
+ * @param ext component of the path
+ * @param ent entity identifier
  */
 void
 GNUNET_FS_remove_sync_file_ (struct GNUNET_FS_Handle *h, const char *ext,
@@ -527,9 +527,9 @@ GNUNET_FS_remove_sync_file_ (struct GNUNET_FS_Handle *h, const char *ext,
  * Remove serialization/deserialization file from disk.
  *
  * @param h master context
- * @param ext component of the path 
+ * @param ext component of the path
  * @param uni parent name
- * @param ent entity identifier 
+ * @param ent entity identifier
  */
 static void
 remove_sync_file_in_dir (struct GNUNET_FS_Handle *h, const char *ext,
@@ -556,8 +556,8 @@ remove_sync_file_in_dir (struct GNUNET_FS_Handle *h, const char *ext,
  * Remove serialization/deserialization directory from disk.
  *
  * @param h master context
- * @param ext component of the path 
- * @param uni unique name of parent 
+ * @param ext component of the path
+ * @param uni unique name of parent
  */
 void
 GNUNET_FS_remove_sync_dir_ (struct GNUNET_FS_Handle *h, const char *ext,
@@ -891,7 +891,7 @@ deserialize_file_information (struct GNUNET_FS_Handle *h, const char *filename)
  * Given a serialization name (full absolute path), return the
  * basename of the file (without the path), which must only
  * consist of the 6 random characters.
- * 
+ *
  * @param fullname name to extract the basename from
  * @return copy of the basename, NULL on error
  */
@@ -926,7 +926,7 @@ get_serialization_short_name (const char *fullname)
  * is enabled and returns NULL if not.
  *
  * @param h master context
- * @param ext component of the path 
+ * @param ext component of the path
  * @return NULL on errror
  */
 static char *
@@ -961,7 +961,7 @@ make_serialization_file_name (struct GNUNET_FS_Handle *h, const char *ext)
  * is enabled and returns NULL if not.
  *
  * @param h master context
- * @param ext component of the path 
+ * @param ext component of the path
  * @param uni name of parent
  * @return NULL on errror
  */
@@ -1396,7 +1396,7 @@ cleanup:
  * on disk.  Note that all internal FS-operations that change
  * publishing structs should already call "sync" internally,
  * so this function is likely not useful for clients.
- * 
+ *
  * @param pc the struct to sync
  */
 void
@@ -1463,7 +1463,7 @@ cleanup:
  * on disk.  Note that all internal FS-operations that change
  * publishing structs should already call "sync" internally,
  * so this function is likely not useful for clients.
- * 
+ *
  * @param uc the struct to sync
  */
 void
@@ -1516,7 +1516,7 @@ cleanup:
 
 /**
  * Serialize a download request.
- * 
+ *
  * @param wh the 'struct GNUNET_BIO_WriteHandle*'
  * @param dr the 'struct DownloadRequest'
  * @return GNUNET_YES on success, GNUNET_NO on error
@@ -1545,7 +1545,7 @@ write_download_request (struct GNUNET_BIO_WriteHandle *wh,
 
 /**
  * Read a download request tree.
- * 
+ *
  * @param rh stream to read from
  * @return value the 'struct DownloadRequest', NULL on error
  */
@@ -1646,7 +1646,7 @@ get_download_sync_filename (struct GNUNET_FS_DownloadContext *dc,
  * on disk.  Note that all internal FS-operations that change
  * publishing structs should already call "sync" internally,
  * so this function is likely not useful for clients.
- * 
+ *
  * @param dc the struct to sync
  */
 void
@@ -1748,7 +1748,7 @@ cleanup:
  * on disk.  Note that all internal FS-operations that change
  * publishing structs should already call "sync" internally,
  * so this function is likely not useful for clients.
- * 
+ *
  * @param sr the struct to sync
  */
 void
@@ -1825,7 +1825,7 @@ cleanup:
  * on disk.  Note that all internal FS-operations that change
  * publishing structs should already call "sync" internally,
  * so this function is likely not useful for clients.
- * 
+ *
  * @param sc the struct to sync
  */
 void
@@ -2022,7 +2022,7 @@ deserialize_download (struct GNUNET_FS_Handle *h,
 
 
 /**
- * Deserialize a search. 
+ * Deserialize a search.
  *
  * @param h overall context
  * @param rh file to deserialize from
@@ -2165,7 +2165,7 @@ cleanup:
  * resume the download (put it in the queue).  Does this
  * recursively for the top-level download and all child
  * downloads.
- * 
+ *
  * @param dc download to resume
  */
 static void
@@ -2511,7 +2511,7 @@ signal_search_resume (struct GNUNET_FS_SearchContext *sc)
 
 
 /**
- * Deserialize a search. 
+ * Deserialize a search.
  *
  * @param h overall context
  * @param rh file to deserialize from
@@ -2700,7 +2700,7 @@ deserialization_master (const char *master_path, GNUNET_FileNameCallback proc,
  * 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
diff --git a/src/fs/fs.h b/src/fs/fs.h
index 11cfc755e..1629af852 100644
--- a/src/fs/fs.h
+++ b/src/fs/fs.h
@@ -465,7 +465,7 @@ struct GNUNET_FS_FileInformation
   char *emsg;
 
   /**
-   * Name of the file or directory (must be an absolute path). 
+   * Name of the file or directory (must be an absolute path).
    */
   char *filename;
 
@@ -779,7 +779,7 @@ GNUNET_FS_dequeue_ (struct GNUNET_FS_QueueEntry *qh);
  * @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
@@ -811,7 +811,7 @@ GNUNET_FS_make_file_reader_context_ (const char *filename);
  * @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
@@ -909,7 +909,7 @@ GNUNET_FS_download_start_task_ (void *cls,
 
 
 /**
- * Fill in all of the generic fields for 
+ * Fill in all of the generic fields for
  * an unindex event and call the callback.
  *
  * @param pi structure to fill in
@@ -973,8 +973,8 @@ GNUNET_FS_search_start_probe_ (struct GNUNET_FS_SearchResult *sr);
  * Remove serialization/deserialization file from disk.
  *
  * @param h master context
- * @param ext component of the path 
- * @param ent entity identifier 
+ * @param ext component of the path
+ * @param ent entity identifier
  */
 void
 GNUNET_FS_remove_sync_file_ (struct GNUNET_FS_Handle *h, const char *ext,
@@ -985,8 +985,8 @@ GNUNET_FS_remove_sync_file_ (struct GNUNET_FS_Handle *h, const char *ext,
  * Remove serialization/deserialization directory from disk.
  *
  * @param h master context
- * @param ext component of the path 
- * @param uni unique name of parent 
+ * @param ext component of the path
+ * @param uni unique name of parent
  */
 void
 GNUNET_FS_remove_sync_dir_ (struct GNUNET_FS_Handle *h, const char *ext,
@@ -998,7 +998,7 @@ GNUNET_FS_remove_sync_dir_ (struct GNUNET_FS_Handle *h, const char *ext,
  * on disk.  Note that all internal FS-operations that change
  * file information data should already call "sync" internally,
  * so this function is likely not useful for clients.
- * 
+ *
  * @param fi the struct to sync
  */
 void
@@ -1009,7 +1009,7 @@ GNUNET_FS_file_information_sync_ (struct GNUNET_FS_FileInformation *f);
  * on disk.  Note that all internal FS-operations that change
  * publishing structs should already call "sync" internally,
  * so this function is likely not useful for clients.
- * 
+ *
  * @param pc the struct to sync
  */
 void
@@ -1020,7 +1020,7 @@ GNUNET_FS_publish_sync_ (struct GNUNET_FS_PublishContext *pc);
  * on disk.  Note that all internal FS-operations that change
  * publishing structs should already call "sync" internally,
  * so this function is likely not useful for clients.
- * 
+ *
  * @param uc the struct to sync
  */
 void
@@ -1031,7 +1031,7 @@ GNUNET_FS_unindex_sync_ (struct GNUNET_FS_UnindexContext *uc);
  * on disk.  Note that all internal FS-operations that change
  * publishing structs should already call "sync" internally,
  * so this function is likely not useful for clients.
- * 
+ *
  * @param sc the struct to sync
  */
 void
@@ -1042,7 +1042,7 @@ GNUNET_FS_search_sync_ (struct GNUNET_FS_SearchContext *sc);
  * on disk.  Note that all internal FS-operations that change
  * publishing structs should already call "sync" internally,
  * so this function is likely not useful for clients.
- * 
+ *
  * @param sr the struct to sync
  */
 void
@@ -1053,7 +1053,7 @@ GNUNET_FS_search_result_sync_ (struct GNUNET_FS_SearchResult *sr);
  * on disk.  Note that all internal FS-operations that change
  * publishing structs should already call "sync" internally,
  * so this function is likely not useful for clients.
- * 
+ *
  * @param dc the struct to sync
  */
 void
@@ -1147,7 +1147,7 @@ GNUNET_FS_make_top (struct GNUNET_FS_Handle *h, SuspendSignalFunction ssf,
 
 /**
  * Destroy a top-level activity entry.
- * 
+ *
  * @param h global fs handle
  * @param top top level activity entry
  */
@@ -1660,7 +1660,7 @@ enum BlockRequestState
   BRS_RECONSTRUCT_UP = 3,
 
     /**
-     * We've determined the real, desired CHK for this block 
+     * We've determined the real, desired CHK for this block
      * (full tree reconstruction failed), request is now pending.
      * If the CHK that bubbled up through reconstruction did match
      * the top-level request, the state machine for the subtree
@@ -1672,7 +1672,7 @@ enum BlockRequestState
      * We've successfully downloaded this block, but the children
      * still need to be either downloaded or verified (download
      * request propagates down).  If the download fails, the
-     * state machine for this block may move to 
+     * state machine for this block may move to
      * BRS_DOWNLOAD_ERROR instead.
      */
   BRS_DOWNLOAD_DOWN = 5,
@@ -2127,7 +2127,7 @@ struct IndexStartMessage
 struct IndexInfoMessage
 {
   /**
-   * Message type will be 
+   * Message type will be
    * GNUNET_MESSAGE_TYPE_FS_INDEX_LIST_ENTRY.
    */
   struct GNUNET_MessageHeader header;
@@ -2160,7 +2160,7 @@ struct UnindexMessage
 {
 
   /**
-   * Message type will be 
+   * Message type will be
    * GNUNET_MESSAGE_TYPE_FS_UNINDEX.
    */
   struct GNUNET_MessageHeader header;
@@ -2186,13 +2186,13 @@ struct SearchMessage
 {
 
   /**
-   * Message type will be 
+   * Message type will be
    * GNUNET_MESSAGE_TYPE_FS_START_SEARCH.
    */
   struct GNUNET_MessageHeader header;
 
   /**
-   * Bitmask with options.  Zero for no options, one for loopback-only.  
+   * Bitmask with options.  Zero for no options, one for loopback-only.
    * Other bits are currently not defined.
    */
   int32_t options GNUNET_PACKED;
@@ -2216,7 +2216,7 @@ struct SearchMessage
    * or similar blunt actions in order to avoid exposing ourselves).
    * <p>
    * If the request is for an SBLOCK, this is the identity of the
-   * pseudonym to which the SBLOCK belongs. 
+   * pseudonym to which the SBLOCK belongs.
    * <p>
    * If the request is for a KBLOCK, "target" must be all zeros.
    */
@@ -2346,7 +2346,7 @@ struct PutMessage
   uint32_t type GNUNET_PACKED;
 
   /**
-   * When does this result expire? 
+   * When does this result expire?
    */
   struct GNUNET_TIME_AbsoluteNBO expiration;
 
@@ -2362,7 +2362,7 @@ struct PutMessage
 struct MigrationStopMessage
 {
   /**
-   * Message type will be 
+   * Message type will be
    * GNUNET_MESSAGE_TYPE_FS_MIGRATION_STOP.
    */
   struct GNUNET_MessageHeader header;
diff --git a/src/fs/fs_directory.c b/src/fs/fs_directory.c
index 61ed1586f..f43fe14a7 100644
--- a/src/fs/fs_directory.c
+++ b/src/fs/fs_directory.c
@@ -72,7 +72,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
@@ -124,7 +124,7 @@ struct GetFullDataClosure
  *        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
@@ -341,7 +341,7 @@ struct GNUNET_FS_DirectoryBuilder
 
 /**
  * Create a directory builder.
- * 
+ *
  * @param mdir metadata for the directory
  */
 struct GNUNET_FS_DirectoryBuilder *
@@ -362,7 +362,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/fs/fs_download.c b/src/fs/fs_download.c
index 89de277da..ba4461986 100644
--- a/src/fs/fs_download.c
+++ b/src/fs/fs_download.c
@@ -59,7 +59,7 @@ is_recursive_download (struct GNUNET_FS_DownloadContext *dc)
  * Given the offset of a block (with respect to the DBLOCKS) and its
  * depth, return the offset where we would store this block in the
  * file.
- * 
+ *
  * @param fsize overall file size
  * @param off offset of the block in the file
  * @param depth depth of the block in the tree, 0 for DBLOCK
@@ -134,8 +134,8 @@ GNUNET_FS_download_make_status_ (struct GNUNET_FS_ProgressInfo *pi,
 
 /**
  * We're ready to transmit a search request to the
- * file-sharing service.  Do it.  If there is 
- * more than one request pending, try to send 
+ * file-sharing service.  Do it.  If there is
+ * more than one request pending, try to send
  * multiple or request another transmission.
  *
  * @param cls closure
@@ -204,7 +204,7 @@ process_result_with_request (void *cls, const GNUNET_HashCode * key,
  * We've found a matching block without downloading it.
  * Encrypt it and pass it to our "receive" function as
  * if we had received it from the network.
- * 
+ *
  * @param dc download in question
  * @param chk request this relates to
  * @param dr request details
@@ -543,7 +543,7 @@ try_match_block (struct GNUNET_FS_DownloadContext *dc,
  *        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
@@ -1057,7 +1057,7 @@ process_result_with_request (void *cls, const GNUNET_HashCode * key,
     dc->completed += app;
 
     /* do recursive download if option is set and either meta data
-     * says it is a directory or if no meta data is given AND filename 
+     * says it is a directory or if no meta data is given AND filename
      * ends in '.gnd' (top-level case) */
     if (is_recursive_download (dc))
       GNUNET_FS_directory_list_contents (prc->size, pt, off,
@@ -1242,8 +1242,8 @@ receive_results (void *cls, const struct GNUNET_MessageHeader *msg)
 
 /**
  * We're ready to transmit a search request to the
- * file-sharing service.  Do it.  If there is 
- * more than one request pending, try to send 
+ * file-sharing service.  Do it.  If there is
+ * more than one request pending, try to send
  * multiple or request another transmission.
  *
  * @param cls closure
@@ -1495,7 +1495,7 @@ deactivate_fs_download (void *cls)
  * @param depth depth of the current entry, 0 are the DBLOCKs,
  *              top level block is 'dc->treedepth - 1'
  * @param dr_offset offset in the original file this block maps to
- *              (as in, offset of the first byte of the first DBLOCK 
+ *              (as in, offset of the first byte of the first DBLOCK
  *               in the subtree rooted in the returned download request tree)
  * @param file_start_offset desired starting offset for the download
  *             in the original file; requesting tree should not contain
@@ -1616,7 +1616,7 @@ get_next_block (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  *
  * This function checks if the content on disk matches
  * the expected content based on the URI.
- * 
+ *
  * @param cls closure
  * @param chk content hash key for the block
  * @param offset offset of the block
@@ -1658,7 +1658,7 @@ reconstruct_cb (void *cls, const struct ContentHashKey *chk, uint64_t offset,
   case BRS_CHK_SET:
     if (0 == memcmp (chk, &dr->chk, sizeof (struct ContentHashKey)))
     {
-      /* block matches, hence tree below matches; 
+      /* block matches, hence tree below matches;
        * this request is done! */
       dr->state = BRS_DOWNLOAD_UP;
       /* calculate how many bytes of payload this block
@@ -1816,7 +1816,7 @@ GNUNET_FS_download_start_task_ (void *cls,
         /* already done entirely, party! */
         if (dc->rfh != NULL)
         {
-          /* avoid hanging on to file handle longer than 
+          /* avoid hanging on to file handle longer than
            * necessary */
           GNUNET_DISK_file_close (dc->rfh);
           dc->rfh = NULL;
@@ -1851,7 +1851,7 @@ GNUNET_FS_download_start_task_ (void *cls,
     {
       if (dc->rfh != NULL)
       {
-        /* avoid hanging on to file handle longer than 
+        /* avoid hanging on to file handle longer than
          * necessary */
         GNUNET_DISK_file_close (dc->rfh);
         dc->rfh = NULL;
diff --git a/src/fs/fs_file_information.c b/src/fs/fs_file_information.c
index a67b22036..fadcfea05 100644
--- a/src/fs/fs_file_information.c
+++ b/src/fs/fs_file_information.c
@@ -227,7 +227,7 @@ GNUNET_FS_file_information_create_from_data (struct GNUNET_FS_Handle *h,
  * @param h handle to the file sharing subsystem
  * @param client_info initial value for the 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
@@ -592,7 +592,7 @@ GNUNET_FS_file_information_create_empty_directory (struct GNUNET_FS_Handle *h,
  *
  * @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
  */
diff --git a/src/fs/fs_misc.c b/src/fs/fs_misc.c
index 3a8260d05..6bd4e59f8 100644
--- a/src/fs/fs_misc.c
+++ b/src/fs/fs_misc.c
@@ -30,7 +30,7 @@
 
 /**
  * Suggest a filename based on given metadata.
- * 
+ *
  * @param md given meta data
  * @return NULL if meta data is useless for suggesting a filename
  */
diff --git a/src/fs/fs_namespace.c b/src/fs/fs_namespace.c
index 236e8d59b..7475896a8 100644
--- a/src/fs/fs_namespace.c
+++ b/src/fs/fs_namespace.c
@@ -36,7 +36,7 @@
  * Return the name of the directory in which we store
  * our local namespaces (or rather, their public keys).
  *
- * @param h global fs handle 
+ * @param h global fs handle
  * @return NULL on error, otherwise the name of the directory
  */
 static char *
@@ -61,7 +61,7 @@ get_namespace_directory (struct GNUNET_FS_Handle *h)
  * Return the name of the directory in which we store
  * the update information graph for the given local namespace.
  *
- * @param ns namespace handle 
+ * @param ns namespace handle
  * @return NULL on error, otherwise the name of the directory
  */
 static char *
@@ -87,7 +87,7 @@ get_update_information_directory (struct GNUNET_FS_Namespace *ns)
 
 /**
  * Write the namespace update node graph to a file.
- * 
+ *
  * @param ns namespace to dump
  */
 static void
@@ -134,7 +134,7 @@ END:
 
 /**
  * Read the namespace update node graph from a file.
- * 
+ *
  * @param ns namespace to read
  */
 static void
@@ -280,7 +280,7 @@ struct AdvertisementContext
 
 /**
  * Disconnect from the datastore.
- * 
+ *
  * @param cls datastore handle
  * @param tc scheduler context
  */
@@ -375,7 +375,7 @@ advertisement_cont (void *cls, int success, const char *msg)
 
 
 /**
- * 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
@@ -965,7 +965,7 @@ struct FindTreeClosure
  * head of an tree if it is in the 'tree_array' under its respective
  * 'tree_id'.
  *
- * In short, we're trying to find the smallest number of tree to 
+ * In short, we're trying to find the smallest number of tree to
  * cover a directed graph.
  *
  * @param cls closure (of type 'struct FindTreeClosure')
@@ -988,7 +988,7 @@ find_trees (void *cls, const GNUNET_HashCode * key, void *value)
       return GNUNET_YES;        /* circular */
     GNUNET_assert (nsn->tree_id < fc->tree_array_size);
     if (fc->tree_array[nsn->tree_id] != nsn)
-      return GNUNET_YES;        /* part of "another" (directed) TREE, 
+      return GNUNET_YES;        /* part of "another" (directed) TREE,
                                  * and not root of it, end trace */
     if (nsn->tree_id == fc->id)
       return GNUNET_YES;        /* that's our own root (can this be?) */
@@ -1015,12 +1015,12 @@ find_trees (void *cls, const GNUNET_HashCode * key, void *value)
  * 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 Tree
  * 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 the final tree are possible (including self-loops).
diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c
index 94641e934..b286d41ca 100644
--- a/src/fs/fs_publish.c
+++ b/src/fs/fs_publish.c
@@ -38,7 +38,7 @@
 
 
 /**
- * Fill in all of the generic fields for 
+ * Fill in all of the generic fields for
  * a publish event and call the callback.
  *
  * @param pi structure to fill in
@@ -216,7 +216,7 @@ signal_publish_error (struct GNUNET_FS_FileInformation *p,
 
 /**
  * Datastore returns from reservation cancel request.
- * 
+ *
  * @param cls the 'struct GNUNET_FS_PublishContext'
  * @param success success code (not used)
  * @param msg error message (typically NULL, not used)
@@ -371,7 +371,7 @@ block_reader (void *cls, uint64_t offset, size_t max, void *buf, char **emsg)
   {
     pt_size = GNUNET_MIN (max, p->data.file.file_size - offset);
     if (pt_size == 0)
-      return 0;                 /* calling reader with pt_size==0 
+      return 0;                 /* calling reader with pt_size==0
                                  * might free buf, so don't! */
     if (pt_size !=
         p->data.file.reader (p->data.file.reader_cls, offset, pt_size, buf,
@@ -441,7 +441,7 @@ encode_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * or (on error) "GNUNET_FS_tree_encode_finish".
  *
  * @param cls closure
- * @param chk content hash key for the block 
+ * @param chk content hash key for the block
  * @param offset offset of the block in the file
  * @param depth depth of the block in the file, 0 for DBLOCK
  * @param type type of the block (IBLOCK or DBLOCK)
@@ -1059,7 +1059,7 @@ GNUNET_FS_publish_signal_suspend_ (void *cls)
 /**
  * We have gotten a reply for our space reservation request.
  * Either fail (insufficient space) or start publishing for good.
- * 
+ *
  * @param cls the 'struct GNUNET_FS_PublishContext*'
  * @param success positive reservation ID on success
  * @param msg error message on error, otherwise NULL
@@ -1096,9 +1096,9 @@ finish_reserve (void *cls, int success, const char *msg)
  * @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 *
@@ -1206,7 +1206,7 @@ fip_signal_stop (void *cls, struct GNUNET_FS_FileInformation *fi,
 
 
 /**
- * Stop an upload.  Will abort incomplete uploads (but 
+ * Stop an upload.  Will abort incomplete uploads (but
  * not remove blocks that have already been publishd) or
  * simply clean up the state for completed uploads.
  * Must NOT be called from within the event callback!
diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c
index 0c47eb173..10cce3f1f 100644
--- a/src/fs/fs_search.c
+++ b/src/fs/fs_search.c
@@ -62,7 +62,7 @@ GNUNET_FS_search_make_status_ (struct GNUNET_FS_ProgressInfo *pi,
 /**
  * Check if the given result is identical
  * to the given URI.
- * 
+ *
  * @param cls points to the URI we check against
  * @param key not used
  * @param value a "struct GNUNET_FS_SearchResult" who's URI we
@@ -85,7 +85,7 @@ test_result_present (void *cls, const GNUNET_HashCode * key, void *value)
 /**
  * We've found a new CHK result.  Let the client
  * know about it.
- * 
+ *
  * @param sc the search context
  * @param sr the specific result
  */
@@ -107,7 +107,7 @@ notify_client_chk_result (struct GNUNET_FS_SearchContext *sc,
 /**
  * We've found new information about an existing CHK result.  Let the
  * client know about it.
- * 
+ *
  * @param sc the search context
  * @param sr the specific result
  */
@@ -151,7 +151,7 @@ struct GetResultContext
 /**
  * Check if the given result is identical to the given URI and if so
  * return it.
- * 
+ *
  * @param cls a "struct GetResultContext"
  * @param key not used
  * @param value a "struct GNUNET_FS_SearchResult" who's URI we
@@ -1379,7 +1379,7 @@ GNUNET_FS_search_start (struct GNUNET_FS_Handle *h,
 
 
 /**
- * Pause search.  
+ * Pause search.
  *
  * @param sc context for the search that should be paused
  */
diff --git a/src/fs/fs_tree.c b/src/fs/fs_tree.c
index 58d0f0127..60e80efbb 100644
--- a/src/fs/fs_tree.c
+++ b/src/fs/fs_tree.c
@@ -100,7 +100,7 @@ struct GNUNET_FS_TreeEncoder
    * In-memory cache of the current CHK tree.
    * This struct will contain the CHK values
    * from the root to the currently processed
-   * node in the tree as identified by 
+   * node in the tree as identified by
    * "current_depth" and "publish_offset".
    * The "chktree" will be initially NULL,
    * then allocated to a sufficient number of
@@ -176,8 +176,8 @@ GNUNET_FS_tree_compute_tree_size (unsigned int depth)
  *
  * @param depth depth of the IBlock in the tree, 0 would be a DBLOCK,
  *        must be > 0 (this function is for IBLOCKs only!)
- * @param end_offset current offset in the payload (!) of the overall file, 
- *        must be > 0 (since this function is called at the 
+ * @param end_offset current offset in the payload (!) of the overall file,
+ *        must be > 0 (since this function is called at the
  *        end of a block).
  * @return size of the corresponding IBlock
  */
@@ -264,7 +264,7 @@ GNUNET_FS_tree_calculate_block_size (uint64_t fsize, uint64_t offset,
  * @param cls closure for reader, proc, progress and cont
  * @param reader function to call to read plaintext data
  * @param proc function to call on each encrypted block
- * @param progress function to call with progress information 
+ * @param progress function to call with progress information
  * @param cont function to call when done
  */
 struct GNUNET_FS_TreeEncoder *
@@ -298,7 +298,7 @@ GNUNET_FS_tree_encoder_create (struct GNUNET_FS_Handle *h, uint64_t size,
  *
  * @param depth depth of the IBlock in the tree (aka overall
  *               number of tree levels minus depth); 0 == DBlock
- * @param end_offset current offset in the overall file, 
+ * @param end_offset current offset in the overall file,
  *               at the *beginning* of the block for DBLOCKs (depth==0),
  *               otherwise at the *end* of the block (exclusive)
  * @return (array of CHKs') offset in the above IBlock
@@ -421,7 +421,7 @@ GNUNET_FS_tree_encoder_next (struct GNUNET_FS_TreeEncoder *te)
 /**
  * Clean up a tree encoder and return information
  * about the resulting URI or an error message.
- * 
+ *
  * @param te the tree encoder to clean up
  * @param uri set to the resulting URI (if encoding finished)
  * @param emsg set to an error message (if an error occured
diff --git a/src/fs/fs_tree.h b/src/fs/fs_tree.h
index b39a47cd3..56c32a390 100644
--- a/src/fs/fs_tree.h
+++ b/src/fs/fs_tree.h
@@ -35,7 +35,7 @@
 #include "fs.h"
 
 /**
- * Compute the depth of the CHK tree.  
+ * Compute the depth of the CHK tree.
  *
  * @param flen file length for which to compute the depth
  * @return depth of the tree, always > 0.  A depth of 1 means only a DBLOCK.
@@ -133,7 +133,7 @@ typedef void (*GNUNET_FS_TreeProgressCallback) (void *cls, uint64_t offset,
  * @param cls closure for reader, proc, progress and cont
  * @param reader function to call to read plaintext data
  * @param proc function to call on each encrypted block
- * @param progress function to call with progress information 
+ * @param progress function to call with progress information
  * @param cont function to call when done
  * @return tree encoder context
  */
@@ -146,8 +146,8 @@ GNUNET_FS_tree_encoder_create (struct GNUNET_FS_Handle *h, uint64_t size,
 
 
 /**
- * Encrypt the next block of the file (and 
- * call proc and progress accordingly; or 
+ * Encrypt the next block of the file (and
+ * call proc and progress accordingly; or
  * of course "cont" if we have already completed
  * encoding of the entire file).
  *
@@ -160,7 +160,7 @@ GNUNET_FS_tree_encoder_next (struct GNUNET_FS_TreeEncoder *te);
 /**
  * Clean up a tree encoder and return information
  * about the resulting URI or an error message.
- * 
+ *
  * @param te the tree encoder to clean up
  * @param uri set to the resulting URI (if encoding finished)
  * @param emsg set to an error message (if an error occured
@@ -179,7 +179,7 @@ GNUNET_FS_tree_encoder_finish (struct GNUNET_FS_TreeEncoder *te,
 /**
  * Get data that would be needed to resume
  * the encoding later.
- * 
+ *
  * @param te encoding to resume
  * @param data set to the resume data
  * @param size set to the size of the resume data
@@ -192,7 +192,7 @@ GNUNET_FS_tree_encoder_resume_get_data (const struct GNUNET_FS_TreeEncoder *te,
 /**
  * Reset tree encoder to point previously
  * obtained for resuming.
- * 
+ *
  * @param te encoding to resume
  * @param data the resume data
  * @param size the size of the resume data
diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c
index a992c5ff6..a37a39a78 100644
--- a/src/fs/fs_unindex.c
+++ b/src/fs/fs_unindex.c
@@ -68,7 +68,7 @@ unindex_reader (void *cls, uint64_t offset, size_t max, void *buf, char **emsg)
 
 
 /**
- * Fill in all of the generic fields for 
+ * Fill in all of the generic fields for
  * an unindex event and call the callback.
  *
  * @param pi structure to fill in
@@ -443,7 +443,7 @@ GNUNET_FS_unindex_signal_suspend_ (void *cls)
  * @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,
diff --git a/src/fs/fs_uri.c b/src/fs/fs_uri.c
index 206a8adca..b654b2a81 100644
--- a/src/fs/fs_uri.c
+++ b/src/fs/fs_uri.c
@@ -125,7 +125,7 @@ GNUNET_FS_uri_to_key (const struct GNUNET_FS_Uri *uri, GNUNET_HashCode * key)
  * 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 *
@@ -187,7 +187,7 @@ GNUNET_FS_uri_ksk_to_string_fancy (const struct GNUNET_FS_Uri *uri)
  * spaces), return a copy of the keyword without %-encoding and
  * without double-quotes (%22).  Also, add a space at the beginning
  * if there is not a '+'.
- * 
+ *
  * @param in string with %-encoding
  * @param emsg where to store the parser error message (if any)
  * @return decodded string with leading space (or preserved plus)
@@ -971,7 +971,7 @@ GNUNET_FS_uri_sks_create_from_nsid (GNUNET_HashCode * nsid, const char *id)
 
 /**
  * Canonicalize a keyword.
- * 
+ *
  * @param in input string (the keyword)
  * @return canonicalized keyword
  */
@@ -1049,7 +1049,7 @@ canonicalize_keyword (const char *in)
  * 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 *
@@ -1568,7 +1568,7 @@ GNUNET_FS_uri_test_loc (const struct GNUNET_FS_Uri *uri)
  *        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
diff --git a/src/fs/gnunet-download.c b/src/fs/gnunet-download.c
index 748a8f09c..f38805c2b 100644
--- a/src/fs/gnunet-download.c
+++ b/src/fs/gnunet-download.c
@@ -75,7 +75,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 /**
- * Called by FS client to give information about the progress of an 
+ * Called by FS client to give information about the progress of an
  * operation.
  *
  * @param cls closure
diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c
index 7edad6979..9cfdfe6a5 100644
--- a/src/fs/gnunet-publish.c
+++ b/src/fs/gnunet-publish.c
@@ -87,7 +87,7 @@ do_stop_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 /**
- * Called by FS client to give information about the progress of an 
+ * Called by FS client to give information about the progress of an
  * operation.
  *
  * @param cls closure
diff --git a/src/fs/gnunet-search.c b/src/fs/gnunet-search.c
index eb5345833..3a30f6c2b 100644
--- a/src/fs/gnunet-search.c
+++ b/src/fs/gnunet-search.c
@@ -62,7 +62,7 @@ static int local_only;
  *        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
@@ -117,7 +117,7 @@ clean_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 /**
- * Called by FS client to give information about the progress of an 
+ * Called by FS client to give information about the progress of an
  * operation.
  *
  * @param cls closure
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
index 0457607d5..2e3c7742f 100644
--- a/src/fs/gnunet-service-fs.c
+++ b/src/fs/gnunet-service-fs.c
@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  *
  * To use:
- * - consider re-issue GSF_dht_lookup_ after non-DHT reply received 
+ * - consider re-issue GSF_dht_lookup_ after non-DHT reply received
  * - implement 'SUPPORT_DELAYS'
  *
  */
@@ -59,7 +59,7 @@
 
 
 /**
- * How quickly do we age cover traffic?  At the given 
+ * How quickly do we age cover traffic?  At the given
  * time interval, remaining cover traffic counters are
  * decremented by 1/16th.
  */
@@ -106,13 +106,13 @@ struct GNUNET_LOAD_Value *GSF_rt_entry_lifetime;
 double GSF_current_priorities;
 
 /**
- * How many query messages have we received 'recently' that 
+ * How many query messages have we received 'recently' that
  * have not yet been claimed as cover traffic?
  */
 unsigned int GSF_cover_query_count;
 
 /**
- * How many content messages have we received 'recently' that 
+ * How many content messages have we received 'recently' that
  * have not yet been claimed as cover traffic?
  */
 unsigned int GSF_cover_content_count;
@@ -192,8 +192,8 @@ GSF_update_datastore_delay_ (struct GNUNET_TIME_Absolute start)
 /**
  * Test if the DATABASE (GET) load on this peer is too high
  * to even consider processing the query at
- * all.  
- * 
+ * all.
+ *
  * @return GNUNET_YES if the load is too high to do anything (load high)
  *         GNUNET_NO to process normally (load normal)
  *         GNUNET_SYSERR to process for free (load low)
@@ -311,7 +311,7 @@ handle_p2p_get (void *cls, const struct GNUNET_PeerIdentity *other,
 /**
  * We're done with the local lookup, now consider
  * P2P processing (depending on request options and
- * result status).  Also signal that we can now 
+ * result status).  Also signal that we can now
  * receive more request information from the client.
  *
  * @param cls the client doing the request ('struct GNUNET_SERVER_Client')
diff --git a/src/fs/gnunet-service-fs.h b/src/fs/gnunet-service-fs.h
index bee814318..ef2eebc8d 100644
--- a/src/fs/gnunet-service-fs.h
+++ b/src/fs/gnunet-service-fs.h
@@ -137,13 +137,13 @@ extern struct GNUNET_LOAD_Value *GSF_rt_entry_lifetime;
 extern double GSF_current_priorities;
 
 /**
- * How many query messages have we received 'recently' that 
+ * How many query messages have we received 'recently' that
  * have not yet been claimed as cover traffic?
  */
 extern unsigned int GSF_cover_query_count;
 
 /**
- * How many content messages have we received 'recently' that 
+ * How many content messages have we received 'recently' that
  * have not yet been claimed as cover traffic?
  */
 extern unsigned int GSF_cover_content_count;
@@ -161,8 +161,8 @@ extern int GSF_enable_randomized_delays;
 /**
  * Test if the DATABASE (GET) load on this peer is too high
  * to even consider processing the query at
- * all.  
- * 
+ * all.
+ *
  * @return GNUNET_YES if the load is too high to do anything (load high)
  *         GNUNET_NO to process normally (load normal)
  *         GNUNET_SYSERR to process for free (load low)
diff --git a/src/fs/gnunet-service-fs_cp.c b/src/fs/gnunet-service-fs_cp.c
index 96d906c5b..527ca7677 100644
--- a/src/fs/gnunet-service-fs_cp.c
+++ b/src/fs/gnunet-service-fs_cp.c
@@ -364,7 +364,7 @@ update_atsi (struct GSF_ConnectedPeer *cp,
 
 /**
  * Return the performance data record for the given peer
- * 
+ *
  * @param cp peer to query
  * @return performance data record for the peer
  */
@@ -818,7 +818,7 @@ transmit_delayed_now (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 /**
  * Get the randomized delay a response should be subjected to.
- * 
+ *
  * @return desired delay
  */
 static struct GNUNET_TIME_Relative
@@ -844,7 +844,7 @@ get_randomized_delay ()
  * Handle a reply to a pending request.  Also called if a request
  * expires (then with data == NULL).  The handler may be called
  * many times (depending on the request type), but will not be
- * called during or after a call to GSF_pending_request_cancel 
+ * called during or after a call to GSF_pending_request_cancel
  * and will also not be called anymore after a call signalling
  * expiration.
  *
@@ -997,7 +997,7 @@ change_host_trust (struct GSF_ConnectedPeer *cp, int value)
 /**
  * We've received a request with the specified priority.  Bound it
  * according to how much we trust the given peer.
- * 
+ *
  * @param prio_in requested priority
  * @param cp the peer making the request
  * @return effective priority
@@ -1333,7 +1333,7 @@ GSF_handle_p2p_query_ (const struct GNUNET_PeerIdentity *other,
  * Function called if there has been a timeout trying to satisfy
  * a transmission request.
  *
- * @param cls the 'struct GSF_PeerTransmitHandle' of the request 
+ * @param cls the 'struct GSF_PeerTransmitHandle' of the request
  * @param tc scheduler context
  */
 static void
@@ -1717,7 +1717,7 @@ create_migration_stop_message (void *cls, size_t size, void *buf)
 /**
  * Ask a peer to stop migrating data to us until the given point
  * in time.
- * 
+ *
  * @param cp peer to ask
  * @param block_time until when to block
  */
diff --git a/src/fs/gnunet-service-fs_cp.h b/src/fs/gnunet-service-fs_cp.h
index 3f25363f1..0f22b0280 100644
--- a/src/fs/gnunet-service-fs_cp.h
+++ b/src/fs/gnunet-service-fs_cp.h
@@ -308,7 +308,7 @@ GSF_handle_p2p_query_ (const struct GNUNET_PeerIdentity *other,
 
 /**
  * Return the performance data record for the given peer
- * 
+ *
  * @param cp peer to query
  * @return performance data record for the peer
  */
@@ -319,7 +319,7 @@ GSF_get_peer_performance_data_ (struct GSF_ConnectedPeer *cp);
 /**
  * Ask a peer to stop migrating data to us until the given point
  * in time.
- * 
+ *
  * @param cp peer to ask
  * @param block_time until when to block
  */
diff --git a/src/fs/gnunet-service-fs_lc.c b/src/fs/gnunet-service-fs_lc.c
index 6460d4f13..a7e78a6ed 100644
--- a/src/fs/gnunet-service-fs_lc.c
+++ b/src/fs/gnunet-service-fs_lc.c
@@ -209,7 +209,7 @@ client_request_destroy (void *cls,
  * Handle a reply to a pending request.  Also called if a request
  * expires (then with data == NULL).  The handler may be called
  * many times (depending on the request type), but will not be
- * called during or after a call to GSF_pending_request_cancel 
+ * called during or after a call to GSF_pending_request_cancel
  * and will also not be called anymore after a call signalling
  * expiration.
  *
@@ -217,7 +217,7 @@ client_request_destroy (void *cls,
  * @param eval evaluation of the result
  * @param pr handle to the original pending request
  * @param reply_anonymity_level anonymity level for the reply, UINT32_MAX for "unknown"
- * @param expiration when does 'data' expire? 
+ * @param expiration when does 'data' expire?
  * @param type type of the block
  * @param data response data, NULL on request expiration
  * @param data_len number of bytes in data
diff --git a/src/fs/gnunet-service-fs_pe.c b/src/fs/gnunet-service-fs_pe.c
index d1a8a1163..1ed7085c4 100644
--- a/src/fs/gnunet-service-fs_pe.c
+++ b/src/fs/gnunet-service-fs_pe.c
@@ -31,7 +31,7 @@
 
 
 /**
- * List of GSF_PendingRequests this request plan 
+ * List of GSF_PendingRequests this request plan
  * participates with.
  */
 struct PendingRequestList;
@@ -67,7 +67,7 @@ struct GSF_RequestPlanReference
 
 
 /**
- * List of GSF_PendingRequests this request plan 
+ * List of GSF_PendingRequests this request plan
  * participates with.
  */
 struct PendingRequestList
@@ -228,7 +228,7 @@ plan (struct PeerPlan *pp, struct GSF_RequestPlan *rp)
                          gettext_noop ("# average retransmission delay (ms)"),
                          total_delay * 1000LL / plan_count, GNUNET_NO);
   prd = GSF_pending_request_get_data_ (rp->prl_head->pr);
-  // FIXME: calculate 'rp->priority'!  
+  // FIXME: calculate 'rp->priority'!
   if (rp->transmission_counter < 32)
     delay =
         GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
@@ -533,7 +533,7 @@ GSF_plan_add_ (struct GSF_ConnectedPeer *cp, struct GSF_PendingRequest *pr)
  * Notify the plan about a peer being no longer available;
  * destroy all entries associated with this peer.
  *
- * @param cp connected peer 
+ * @param cp connected peer
  */
 void
 GSF_plan_notify_peer_disconnect_ (const struct GSF_ConnectedPeer *cp)
diff --git a/src/fs/gnunet-service-fs_pe.h b/src/fs/gnunet-service-fs_pe.h
index 23787908e..3ae9904a6 100644
--- a/src/fs/gnunet-service-fs_pe.h
+++ b/src/fs/gnunet-service-fs_pe.h
@@ -43,7 +43,7 @@ GSF_plan_add_ (struct GSF_ConnectedPeer *cp, struct GSF_PendingRequest *pr);
  * Notify the plan about a peer being no longer available;
  * destroy all entries associated with this peer.
  *
- * @param cp connected peer 
+ * @param cp connected peer
  */
 void
 GSF_plan_notify_peer_disconnect_ (const struct GSF_ConnectedPeer *cp);
diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c
index e5cb1f03c..a1fc60bd9 100644
--- a/src/fs/gnunet-service-fs_pr.c
+++ b/src/fs/gnunet-service-fs_pr.c
@@ -254,7 +254,7 @@ refresh_bloomfilter (struct GSF_PendingRequest *pr)
 
 
 /**
- * Create a new pending request.  
+ * Create a new pending request.
  *
  * @param options request options
  * @param type type of the block that is being requested
@@ -384,7 +384,7 @@ GSF_pending_request_create_ (enum GSF_PendingRequestOptions options,
 
 /**
  * Obtain the public data associated with a pending request
- * 
+ *
  * @param pr pending request
  * @return associated public data
  */
@@ -399,7 +399,7 @@ GSF_pending_request_get_data_ (struct GSF_PendingRequest *pr)
  * Test if two pending requests are compatible (would generate
  * the same query modulo filters and should thus be processed
  * jointly).
- * 
+ *
  * @param pra a pending request
  * @param pra another pending request
  * @return GNUNET_OK if the requests are compatible
@@ -957,8 +957,8 @@ put_migration_continuation (void *cls, int success, const char *msg)
 /**
  * Test if the DATABASE (PUT) load on this peer is too high
  * to even consider processing the query at
- * all.  
- * 
+ * all.
+ *
  * @return GNUNET_YES if the load is too high to do anything (load high)
  *         GNUNET_NO to process normally (load normal or low)
  */
@@ -1089,7 +1089,7 @@ GSF_dht_lookup_ (struct GSF_PendingRequest *pr)
 
 /**
  * Task that issues a warning if the datastore lookup takes too long.
- * 
+ *
  * @param cls the 'struct GSF_PendingRequest'
  * @param tc task context
  */
@@ -1110,7 +1110,7 @@ warn_delay_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 /**
  * Task that issues a warning if the datastore lookup takes too long.
- * 
+ *
  * @param cls the 'struct GSF_PendingRequest'
  * @param tc task context
  */
diff --git a/src/fs/gnunet-service-fs_pr.h b/src/fs/gnunet-service-fs_pr.h
index b68989be7..03fc047fb 100644
--- a/src/fs/gnunet-service-fs_pr.h
+++ b/src/fs/gnunet-service-fs_pr.h
@@ -153,7 +153,7 @@ struct GSF_PendingRequestData
  * Handle a reply to a pending request.  Also called if a request
  * expires (then with data == NULL).  The handler may be called
  * many times (depending on the request type), but will not be
- * called during or after a call to GSF_pending_request_cancel 
+ * called during or after a call to GSF_pending_request_cancel
  * and will also not be called anymore after a call signalling
  * expiration.
  *
@@ -180,7 +180,7 @@ typedef void (*GSF_PendingRequestReplyHandler) (void *cls,
 
 
 /**
- * Create a new pending request.  
+ * Create a new pending request.
  *
  * @param options request options
  * @param type type of the block that is being requested
@@ -232,7 +232,7 @@ GSF_pending_request_update_ (struct GSF_PendingRequest *pr,
 
 /**
  * Obtain the public data associated with a pending request
- * 
+ *
  * @param pr pending request
  * @return associated public data
  */
@@ -244,7 +244,7 @@ GSF_pending_request_get_data_ (struct GSF_PendingRequest *pr);
  * Test if two pending requests are compatible (would generate
  * the same query modulo filters and should thus be processed
  * jointly).
- * 
+ *
  * @param pra a pending request
  * @param pra another pending request
  * @return GNUNET_OK if the requests are compatible
diff --git a/src/fs/gnunet-service-fs_push.c b/src/fs/gnunet-service-fs_push.c
index fb05366af..acdba81f0 100644
--- a/src/fs/gnunet-service-fs_push.c
+++ b/src/fs/gnunet-service-fs_push.c
@@ -34,7 +34,7 @@
 #define DEBUG_FS_MIGRATION GNUNET_NO
 
 /**
- * How long must content remain valid for us to consider it for migration?  
+ * How long must content remain valid for us to consider it for migration?
  * If content will expire too soon, there is clearly no point in pushing
  * it to other peers.  This value gives the threshold for migration.  Note
  * that if this value is increased, the migration testcase may need to be
@@ -65,7 +65,7 @@ struct MigrationReadyBlock
   GNUNET_HashCode query;
 
   /**
-   * When does this block expire? 
+   * When does this block expire?
    */
   struct GNUNET_TIME_Absolute expiration;
 
@@ -313,7 +313,7 @@ count_targets (struct MigrationReadyBlock *block)
 
 /**
  * Check if sending this block to this peer would
- * be a good idea. 
+ * be a good idea.
  *
  * @param peer target peer
  * @param block the block
@@ -419,7 +419,7 @@ find_content (struct MigrationReadyPeer *mrp)
 /**
  * Task that is run periodically to obtain blocks for content
  * migration
- * 
+ *
  * @param cls unused
  * @param tc scheduler context (also unused)
  */
@@ -539,7 +539,7 @@ process_migration_content (void *cls, const GNUNET_HashCode * key, size_t size,
 /**
  * Task that is run periodically to obtain blocks for content
  * migration
- * 
+ *
  * @param cls unused
  * @param tc scheduler context (also unused)
  */
diff --git a/src/fs/gnunet-service-fs_put.c b/src/fs/gnunet-service-fs_put.c
index 4b4925d22..5771b5665 100644
--- a/src/fs/gnunet-service-fs_put.c
+++ b/src/fs/gnunet-service-fs_put.c
@@ -82,7 +82,7 @@ static struct PutOperator operators[] = {
 
 /**
  * Task that is run periodically to obtain blocks for DHT PUTs.
- * 
+ *
  * @param cls type of blocks to gather
  * @param tc scheduler context (unused)
  */
@@ -93,7 +93,7 @@ gather_dht_put_blocks (void *cls,
 
 /**
  * Task that is run periodically to obtain blocks for DHT PUTs.
- * 
+ *
  * @param cls type of blocks to gather
  * @param tc scheduler context (unused)
  */
@@ -169,7 +169,7 @@ process_dht_put_content (void *cls, const GNUNET_HashCode * key, size_t size,
 
 /**
  * Task that is run periodically to obtain blocks for DHT PUTs.
- * 
+ *
  * @param cls type of blocks to gather
  * @param tc scheduler context (unused)
  */
diff --git a/src/fs/gnunet-unindex.c b/src/fs/gnunet-unindex.c
index d52956a75..25560ca10 100644
--- a/src/fs/gnunet-unindex.c
+++ b/src/fs/gnunet-unindex.c
@@ -61,7 +61,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 }
 
 /**
- * Called by FS client to give information about the progress of an 
+ * Called by FS client to give information about the progress of an
  * operation.
  *
  * @param cls closure
diff --git a/src/fs/perf_gnunet_service_fs_p2p_trust.c b/src/fs/perf_gnunet_service_fs_p2p_trust.c
index 3432714b3..6140bb74f 100644
--- a/src/fs/perf_gnunet_service_fs_p2p_trust.c
+++ b/src/fs/perf_gnunet_service_fs_p2p_trust.c
@@ -37,7 +37,7 @@
  * Download speed of type `seeder 1' was 757 KiB/s
  * Download speed of type `seeder 2' was 613 KiB/s
  * Download speed of type `leach` was 539 KiB/s
- * 
+ *
  * - 10 MB, 3 peers, without delays:
  * Download speed of type `seeder 1' was 1784 KiB/s
  * Download speed of type `seeder 2' was 1604 KiB/s
diff --git a/src/fs/test_fs_download_persistence.c b/src/fs/test_fs_download_persistence.c
index c7a0a8b7c..c26a60978 100644
--- a/src/fs/test_fs_download_persistence.c
+++ b/src/fs/test_fs_download_persistence.c
@@ -138,8 +138,8 @@ restart_fs_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 /**
- * Consider scheduling the restart-task. 
- * Only runs the restart task once per event 
+ * Consider scheduling the restart-task.
+ * Only runs the restart task once per event
  * category.
  *
  * @param ev type of the event to consider
diff --git a/src/fs/test_fs_publish_persistence.c b/src/fs/test_fs_publish_persistence.c
index 704c2a4c0..eab0aa650 100644
--- a/src/fs/test_fs_publish_persistence.c
+++ b/src/fs/test_fs_publish_persistence.c
@@ -112,8 +112,8 @@ restart_fs_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 /**
- * Consider scheduling the restart-task. 
- * Only runs the restart task once per event 
+ * Consider scheduling the restart-task.
+ * Only runs the restart task once per event
  * category.
  *
  * @param ev type of the event to consider
diff --git a/src/fs/test_fs_search_persistence.c b/src/fs/test_fs_search_persistence.c
index 6eb18dafb..335b1bee3 100644
--- a/src/fs/test_fs_search_persistence.c
+++ b/src/fs/test_fs_search_persistence.c
@@ -102,8 +102,8 @@ restart_fs_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 /**
- * Consider scheduling the restart-task. 
- * Only runs the restart task once per event 
+ * Consider scheduling the restart-task.
+ * Only runs the restart task once per event
  * category.
  *
  * @param ev type of the event to consider
diff --git a/src/fs/test_fs_unindex_persistence.c b/src/fs/test_fs_unindex_persistence.c
index e81400817..69623ac7c 100644
--- a/src/fs/test_fs_unindex_persistence.c
+++ b/src/fs/test_fs_unindex_persistence.c
@@ -108,8 +108,8 @@ restart_fs_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 /**
- * Consider scheduling the restart-task. 
- * Only runs the restart task once per event 
+ * Consider scheduling the restart-task.
+ * Only runs the restart task once per event
  * category.
  *
  * @param ev type of the event to consider