adding crc16 to gnunet_crypto_lib.h
[oweals/gnunet.git] / src / include / gnunet_fs_service.h
index 2962a9cf2f855b85cdc218e4144f0176e6c887ed..4b1b1b1993e5fec0190119eb534d2cdd3fff6cd6 100644 (file)
@@ -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
@@ -53,7 +53,7 @@ extern "C"
  * 6.1.x: with simplified namespace support
  * 9.0.0: CPS-style integrated API
  */
-#define GNUNET_FS_VERSION 0x00090000
+#define GNUNET_FS_VERSION 0x00090001
 
 
 /* ******************** URI API *********************** */
@@ -89,8 +89,8 @@ typedef int (*GNUNET_FS_KeywordIterator) (void *cls, const char *keyword,
  * @param uri uri to convert to a unique key
  * @param key wherer to store the unique key
  */
-void GNUNET_FS_uri_to_key (const struct GNUNET_FS_Uri *uri,
-                           GNUNET_HashCode * key);
+void
+GNUNET_FS_uri_to_key (const struct GNUNET_FS_Uri *uri, GNUNET_HashCode * key);
 
 /**
  * Convert a URI to a UTF-8 String.
@@ -98,16 +98,18 @@ void GNUNET_FS_uri_to_key (const struct GNUNET_FS_Uri *uri,
  * @param uri uri to convert to a string
  * @return the UTF-8 string
  */
-char *GNUNET_FS_uri_to_string (const struct GNUNET_FS_Uri *uri);
+char *
+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 *GNUNET_FS_uri_ksk_to_string_fancy (const struct GNUNET_FS_Uri *uri);
+char *
+GNUNET_FS_uri_ksk_to_string_fancy (const struct GNUNET_FS_Uri *uri);
 
 
 /**
@@ -118,8 +120,9 @@ char *GNUNET_FS_uri_ksk_to_string_fancy (const struct GNUNET_FS_Uri *uri);
  * @param keyword keyword to add
  * @param is_mandatory is this keyword mandatory?
  */
-void GNUNET_FS_uri_ksk_add_keyword (struct GNUNET_FS_Uri *uri,
-                                    const char *keyword, int is_mandatory);
+void
+GNUNET_FS_uri_ksk_add_keyword (struct GNUNET_FS_Uri *uri, const char *keyword,
+                               int is_mandatory);
 
 
 /**
@@ -129,8 +132,9 @@ void GNUNET_FS_uri_ksk_add_keyword (struct GNUNET_FS_Uri *uri,
  * @param uri ksk uri to modify
  * @param keyword keyword to add
  */
-void GNUNET_FS_uri_ksk_remove_keyword (struct GNUNET_FS_Uri *uri,
-                                       const char *keyword);
+void
+GNUNET_FS_uri_ksk_remove_keyword (struct GNUNET_FS_Uri *uri,
+                                  const char *keyword);
 
 
 /**
@@ -140,14 +144,16 @@ void GNUNET_FS_uri_ksk_remove_keyword (struct GNUNET_FS_Uri *uri,
  * @param emsg where to store the parser error message (if any)
  * @return NULL on error
  */
-struct GNUNET_FS_Uri *GNUNET_FS_uri_parse (const char *uri, char **emsg);
+struct GNUNET_FS_Uri *
+GNUNET_FS_uri_parse (const char *uri, char **emsg);
 
 /**
  * Free URI.
  *
  * @param uri uri to free
  */
-void GNUNET_FS_uri_destroy (struct GNUNET_FS_Uri *uri);
+void
+GNUNET_FS_uri_destroy (struct GNUNET_FS_Uri *uri);
 
 
 /**
@@ -156,8 +162,8 @@ void GNUNET_FS_uri_destroy (struct GNUNET_FS_Uri *uri);
  * @param uri ksk uri to get the number of keywords from
  * @return 0 if this is not a keyword URI
  */
-unsigned int GNUNET_FS_uri_ksk_get_keyword_count (const struct GNUNET_FS_Uri
-                                                  *uri);
+unsigned int
+GNUNET_FS_uri_ksk_get_keyword_count (const struct GNUNET_FS_Uri *uri);
 
 
 /**
@@ -169,9 +175,10 @@ unsigned int GNUNET_FS_uri_ksk_get_keyword_count (const struct GNUNET_FS_Uri
  * @return -1 if this is not a keyword URI, otherwise number of
  *   keywords iterated over until iterator aborted
  */
-int GNUNET_FS_uri_ksk_get_keywords (const struct GNUNET_FS_Uri *uri,
-                                    GNUNET_FS_KeywordIterator iterator,
-                                    void *iterator_cls);
+int
+GNUNET_FS_uri_ksk_get_keywords (const struct GNUNET_FS_Uri *uri,
+                                GNUNET_FS_KeywordIterator iterator,
+                                void *iterator_cls);
 
 
 /**
@@ -181,8 +188,9 @@ int GNUNET_FS_uri_ksk_get_keywords (const struct GNUNET_FS_Uri *uri,
  * @param peer where to store the identify of the peer (presumably) offering the content
  * @return GNUNET_SYSERR if this is not a location URI, otherwise GNUNET_OK
  */
-int GNUNET_FS_uri_loc_get_peer_identity (const struct GNUNET_FS_Uri *uri,
-                                         struct GNUNET_PeerIdentity *peer);
+int
+GNUNET_FS_uri_loc_get_peer_identity (const struct GNUNET_FS_Uri *uri,
+                                     struct GNUNET_PeerIdentity *peer);
 
 
 /**
@@ -191,8 +199,8 @@ int GNUNET_FS_uri_loc_get_peer_identity (const struct GNUNET_FS_Uri *uri,
  * @param uri location URI to get the content URI from
  * @return NULL if argument is not a location URI
  */
-struct GNUNET_FS_Uri *GNUNET_FS_uri_loc_get_uri (const struct GNUNET_FS_Uri
-                                                 *uri);
+struct GNUNET_FS_Uri *
+GNUNET_FS_uri_loc_get_uri (const struct GNUNET_FS_Uri *uri);
 
 
 /**
@@ -201,9 +209,8 @@ struct GNUNET_FS_Uri *GNUNET_FS_uri_loc_get_uri (const struct GNUNET_FS_Uri
  * @param uri location URI to get the expiration from
  * @return expiration time of the URI
  */
-struct GNUNET_TIME_Absolute GNUNET_FS_uri_loc_get_expiration (const struct
-                                                              GNUNET_FS_Uri
-                                                              *uri);
+struct GNUNET_TIME_Absolute
+GNUNET_FS_uri_loc_get_expiration (const struct GNUNET_FS_Uri *uri);
 
 
 /**
@@ -214,38 +221,22 @@ struct GNUNET_TIME_Absolute GNUNET_FS_uri_loc_get_expiration (const struct
  * @param expiration_time how long will the content be offered?
  * @return the location URI, NULL on error
  */
-struct GNUNET_FS_Uri *GNUNET_FS_uri_loc_create (const struct GNUNET_FS_Uri
-                                                *baseUri,
-                                                const struct
-                                                GNUNET_CONFIGURATION_Handle
-                                                *cfg,
-                                                struct GNUNET_TIME_Absolute
-                                                expiration_time);
-
-
-/**
- * Canonicalize keyword URI.  Performs operations such
- * as decapitalization and removal of certain characters.
- * (useful for search).
- *
- * @param uri the URI to canonicalize 
- * @return canonicalized version of the URI, NULL on error
- */
-struct GNUNET_FS_Uri *GNUNET_FS_uri_ksk_canonicalize (const struct GNUNET_FS_Uri
-                                                      *uri);
+struct GNUNET_FS_Uri *
+GNUNET_FS_uri_loc_create (const struct GNUNET_FS_Uri *baseUri,
+                          const struct GNUNET_CONFIGURATION_Handle *cfg,
+                          struct GNUNET_TIME_Absolute expiration_time);
 
 
 /**
  * Merge the sets of keywords from two KSK URIs.
- * (useful for merging the canonicalized keywords with
- * the original keywords for sharing).
  *
  * @param u1 first uri
  * @param u2 second uri
  * @return merged URI, NULL on error
  */
-struct GNUNET_FS_Uri *GNUNET_FS_uri_ksk_merge (const struct GNUNET_FS_Uri *u1,
-                                               const struct GNUNET_FS_Uri *u2);
+struct GNUNET_FS_Uri *
+GNUNET_FS_uri_ksk_merge (const struct GNUNET_FS_Uri *u1,
+                         const struct GNUNET_FS_Uri *u2);
 
 
 /**
@@ -254,7 +245,8 @@ struct GNUNET_FS_Uri *GNUNET_FS_uri_ksk_merge (const struct GNUNET_FS_Uri *u1,
  * @param uri the URI to duplicate
  * @return copy of the URI
  */
-struct GNUNET_FS_Uri *GNUNET_FS_uri_dup (const struct GNUNET_FS_Uri *uri);
+struct GNUNET_FS_Uri *
+GNUNET_FS_uri_dup (const struct GNUNET_FS_Uri *uri);
 
 
 /**
@@ -274,8 +266,8 @@ struct GNUNET_FS_Uri *GNUNET_FS_uri_dup (const struct GNUNET_FS_Uri *uri);
  * @return an FS URI for the given keywords, NULL
  *  if keywords is not legal (i.e. empty).
  */
-struct GNUNET_FS_Uri *GNUNET_FS_uri_ksk_create (const char *keywords,
-                                                char **emsg);
+struct GNUNET_FS_Uri *
+GNUNET_FS_uri_ksk_create (const char *keywords, char **emsg);
 
 
 /**
@@ -295,8 +287,8 @@ struct GNUNET_FS_Uri *GNUNET_FS_uri_ksk_create (const char *keywords,
  * @return an FS URI for the given keywords, NULL
  *  if keywords is not legal (i.e. empty).
  */
-struct GNUNET_FS_Uri *GNUNET_FS_uri_ksk_create_from_args (unsigned int argc,
-                                                          const char **argv);
+struct GNUNET_FS_Uri *
+GNUNET_FS_uri_ksk_create_from_args (unsigned int argc, const char **argv);
 
 
 /**
@@ -306,8 +298,9 @@ struct GNUNET_FS_Uri *GNUNET_FS_uri_ksk_create_from_args (unsigned int argc,
  * @param u2 the other URI
  * @return GNUNET_YES if the URIs are equal
  */
-int GNUNET_FS_uri_test_equal (const struct GNUNET_FS_Uri *u1,
-                              const struct GNUNET_FS_Uri *u2);
+int
+GNUNET_FS_uri_test_equal (const struct GNUNET_FS_Uri *u1,
+                          const struct GNUNET_FS_Uri *u2);
 
 
 /**
@@ -316,7 +309,8 @@ int GNUNET_FS_uri_test_equal (const struct GNUNET_FS_Uri *u1,
  * @param uri the uri to check
  * @return GNUNET_YES if this is an SKS uri
  */
-int GNUNET_FS_uri_test_sks (const struct GNUNET_FS_Uri *uri);
+int
+GNUNET_FS_uri_test_sks (const struct GNUNET_FS_Uri *uri);
 
 
 /**
@@ -333,8 +327,9 @@ struct GNUNET_FS_Namespace;
  * @param emsg where to store an error message
  * @return an FS URI for the given namespace and identifier
  */
-struct GNUNET_FS_Uri *GNUNET_FS_uri_sks_create (struct GNUNET_FS_Namespace *ns,
-                                                const char *id, char **emsg);
+struct GNUNET_FS_Uri *
+GNUNET_FS_uri_sks_create (struct GNUNET_FS_Namespace *ns, const char *id,
+                          char **emsg);
 
 
 /**
@@ -344,8 +339,8 @@ struct GNUNET_FS_Uri *GNUNET_FS_uri_sks_create (struct GNUNET_FS_Namespace *ns,
  * @param id identifier
  * @return an FS URI for the given namespace and identifier
  */
-struct GNUNET_FS_Uri *GNUNET_FS_uri_sks_create_from_nsid (GNUNET_HashCode *
-                                                          nsid, const char *id);
+struct GNUNET_FS_Uri *
+GNUNET_FS_uri_sks_create_from_nsid (GNUNET_HashCode * nsid, const char *id);
 
 
 /**
@@ -356,8 +351,9 @@ struct GNUNET_FS_Uri *GNUNET_FS_uri_sks_create_from_nsid (GNUNET_HashCode *
  * @param nsid where to store the ID of the namespace
  * @return GNUNET_OK on success
  */
-int GNUNET_FS_uri_sks_get_namespace (const struct GNUNET_FS_Uri *uri,
-                                     GNUNET_HashCode * nsid);
+int
+GNUNET_FS_uri_sks_get_namespace (const struct GNUNET_FS_Uri *uri,
+                                 GNUNET_HashCode * nsid);
 
 
 /**
@@ -366,7 +362,8 @@ int GNUNET_FS_uri_sks_get_namespace (const struct GNUNET_FS_Uri *uri,
  * @param uri the sks uri
  * @return NULL on error (not a valid SKS URI)
  */
-char *GNUNET_FS_uri_sks_get_content_id (const struct GNUNET_FS_Uri *uri);
+char *
+GNUNET_FS_uri_sks_get_content_id (const struct GNUNET_FS_Uri *uri);
 
 
 /**
@@ -377,8 +374,9 @@ char *GNUNET_FS_uri_sks_get_content_id (const struct GNUNET_FS_Uri *uri);
  * @param uri SKS uri to convert
  * @return NULL on error (not an SKS URI)
  */
-char *GNUNET_FS_uri_sks_to_string_fancy (struct GNUNET_CONFIGURATION_Handle
-                                         *cfg, const struct GNUNET_FS_Uri *uri);
+char *
+GNUNET_FS_uri_sks_to_string_fancy (struct GNUNET_CONFIGURATION_Handle *cfg,
+                                   const struct GNUNET_FS_Uri *uri);
 
 
 /**
@@ -387,7 +385,8 @@ char *GNUNET_FS_uri_sks_to_string_fancy (struct GNUNET_CONFIGURATION_Handle
  * @param uri the uri
  * @return GNUNET_YES if this is a KSK uri
  */
-int GNUNET_FS_uri_test_ksk (const struct GNUNET_FS_Uri *uri);
+int
+GNUNET_FS_uri_test_ksk (const struct GNUNET_FS_Uri *uri);
 
 
 /**
@@ -396,7 +395,8 @@ int GNUNET_FS_uri_test_ksk (const struct GNUNET_FS_Uri *uri);
  * @param uri the uri to check
  * @return GNUNET_YES if this is a CHK uri
  */
-int GNUNET_FS_uri_test_chk (const struct GNUNET_FS_Uri *uri);
+int
+GNUNET_FS_uri_test_chk (const struct GNUNET_FS_Uri *uri);
 
 
 /**
@@ -406,7 +406,8 @@ int GNUNET_FS_uri_test_chk (const struct GNUNET_FS_Uri *uri);
  * @param uri the CHK (or LOC) URI to inspect
  * @return size of the file as specified in the CHK URI
  */
-uint64_t GNUNET_FS_uri_chk_get_file_size (const struct GNUNET_FS_Uri *uri);
+uint64_t
+GNUNET_FS_uri_chk_get_file_size (const struct GNUNET_FS_Uri *uri);
 
 
 /**
@@ -415,7 +416,8 @@ uint64_t GNUNET_FS_uri_chk_get_file_size (const struct GNUNET_FS_Uri *uri);
  * @param uri the uri to check
  * @return GNUNET_YES if this is a LOC uri
  */
-int GNUNET_FS_uri_test_loc (const struct GNUNET_FS_Uri *uri);
+int
+GNUNET_FS_uri_test_loc (const struct GNUNET_FS_Uri *uri);
 
 
 /**
@@ -426,9 +428,9 @@ int GNUNET_FS_uri_test_loc (const struct GNUNET_FS_Uri *uri);
  * @param md metadata to use
  * @return NULL on error, otherwise a KSK URI
  */
-struct GNUNET_FS_Uri *GNUNET_FS_uri_ksk_create_from_meta_data (const struct
-                                                               GNUNET_CONTAINER_MetaData
-                                                               *md);
+struct GNUNET_FS_Uri *
+GNUNET_FS_uri_ksk_create_from_meta_data (const struct GNUNET_CONTAINER_MetaData
+                                         *md);
 
 
 /* ******************** command-line option parsing API *********************** */
@@ -445,10 +447,10 @@ struct GNUNET_FS_Uri *GNUNET_FS_uri_ksk_create_from_meta_data (const struct
  * @param value command line argument given
  * @return GNUNET_OK on success
  */
-int GNUNET_FS_getopt_set_keywords (struct
-                                   GNUNET_GETOPT_CommandLineProcessorContext
-                                   *ctx, void *scls, const char *option,
-                                   const char *value);
+int
+GNUNET_FS_getopt_set_keywords (struct GNUNET_GETOPT_CommandLineProcessorContext
+                               *ctx, void *scls, const char *option,
+                               const char *value);
 
 
 /**
@@ -463,10 +465,10 @@ int GNUNET_FS_getopt_set_keywords (struct
  * @param value command line argument given
  * @return GNUNET_OK on success
  */
-int GNUNET_FS_getopt_set_metadata (struct
-                                   GNUNET_GETOPT_CommandLineProcessorContext
-                                   *ctx, void *scls, const char *option,
-                                   const char *value);
+int
+GNUNET_FS_getopt_set_metadata (struct GNUNET_GETOPT_CommandLineProcessorContext
+                               *ctx, void *scls, const char *option,
+                               const char *value);
 
 
 
@@ -474,13 +476,13 @@ int GNUNET_FS_getopt_set_metadata (struct
 
 
 /**
- * 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.
  */
@@ -489,93 +491,93 @@ enum GNUNET_FS_Status
   /**
    * Notification that we have started to publish a file structure.
    */
-  GNUNET_FS_STATUS_PUBLISH_START,
+  GNUNET_FS_STATUS_PUBLISH_START = 0,
 
   /**
    * Notification that we have resumed sharing a file structure.
    */
-  GNUNET_FS_STATUS_PUBLISH_RESUME,
+  GNUNET_FS_STATUS_PUBLISH_RESUME = 1,
 
   /**
    * Notification that we have suspended sharing a file structure.
    */
-  GNUNET_FS_STATUS_PUBLISH_SUSPEND,
+  GNUNET_FS_STATUS_PUBLISH_SUSPEND = 2,
 
   /**
    * Notification that we are making progress sharing a file structure.
    */
-  GNUNET_FS_STATUS_PUBLISH_PROGRESS,
+  GNUNET_FS_STATUS_PUBLISH_PROGRESS = 3,
 
   /**
    * Notification that an error was encountered  sharing a file structure.
    * The application will continue to receive resume/suspend events for
    * this structure until "GNUNET_FS_publish_stop" is called.
    */
-  GNUNET_FS_STATUS_PUBLISH_ERROR,
+  GNUNET_FS_STATUS_PUBLISH_ERROR = 4,
 
   /**
    * Notification that we completed sharing a file structure.
    * The application will continue to receive resume/suspend events for
    * this structure until "GNUNET_FS_publish_stop" is called.
    */
-  GNUNET_FS_STATUS_PUBLISH_COMPLETED,
+  GNUNET_FS_STATUS_PUBLISH_COMPLETED = 5,
 
   /**
    * Notification that we have stopped
    * the process of uploading a file structure; no
    * futher events will be generated for this action.
    */
-  GNUNET_FS_STATUS_PUBLISH_STOPPED,
+  GNUNET_FS_STATUS_PUBLISH_STOPPED = 6,
 
   /**
    * Notification that we have started this download.
    */
-  GNUNET_FS_STATUS_DOWNLOAD_START,
+  GNUNET_FS_STATUS_DOWNLOAD_START = 7,
 
   /**
    * Notification that this download is being resumed.
    */
-  GNUNET_FS_STATUS_DOWNLOAD_RESUME,
+  GNUNET_FS_STATUS_DOWNLOAD_RESUME = 8,
 
   /**
    * Notification that this download was suspended.
    */
-  GNUNET_FS_STATUS_DOWNLOAD_SUSPEND,
+  GNUNET_FS_STATUS_DOWNLOAD_SUSPEND = 9,
 
   /**
    * Notification about progress with this download.
    */
-  GNUNET_FS_STATUS_DOWNLOAD_PROGRESS,
+  GNUNET_FS_STATUS_DOWNLOAD_PROGRESS = 10,
 
   /**
    * Notification that this download encountered an error.
    */
-  GNUNET_FS_STATUS_DOWNLOAD_ERROR,
+  GNUNET_FS_STATUS_DOWNLOAD_ERROR = 11,
 
   /**
    * Notification that this download completed.  Note that for
    * directories, completion does not imply completion of all files in
    * the directory.
    */
-  GNUNET_FS_STATUS_DOWNLOAD_COMPLETED,
+  GNUNET_FS_STATUS_DOWNLOAD_COMPLETED = 12,
 
   /**
    * Notification that this download was stopped
    * (final event with respect to this action).
    */
-  GNUNET_FS_STATUS_DOWNLOAD_STOPPED,
+  GNUNET_FS_STATUS_DOWNLOAD_STOPPED = 13,
 
   /**
    * Notification that this download is now actively being
    * pursued (as opposed to waiting in the queue).
    */
-  GNUNET_FS_STATUS_DOWNLOAD_ACTIVE,
+  GNUNET_FS_STATUS_DOWNLOAD_ACTIVE = 14,
 
   /**
    * Notification that this download is no longer actively
    * being pursued (back in the queue).
    */
-  GNUNET_FS_STATUS_DOWNLOAD_INACTIVE,
+  GNUNET_FS_STATUS_DOWNLOAD_INACTIVE = 15,
 
   /**
    * Notification that this download is no longer part of a
@@ -583,122 +585,122 @@ enum GNUNET_FS_Status
    * download (and may thus need to be moved in the GUI
    * into a different category).
    */
-  GNUNET_FS_STATUS_DOWNLOAD_LOST_PARENT,
+  GNUNET_FS_STATUS_DOWNLOAD_LOST_PARENT = 16,
 
   /**
-   * 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.
    */
-  GNUNET_FS_STATUS_SEARCH_START,
+  GNUNET_FS_STATUS_SEARCH_START = 17,
 
   /**
    * Last event when a search is being resumed;
    * note that "GNUNET_FS_SEARCH_START" will not
    * be generated in this case.
    */
-  GNUNET_FS_STATUS_SEARCH_RESUME,
+  GNUNET_FS_STATUS_SEARCH_RESUME = 18,
 
   /**
    * Event generated for each search result
    * when the respective search is resumed.
    */
-  GNUNET_FS_STATUS_SEARCH_RESUME_RESULT,
+  GNUNET_FS_STATUS_SEARCH_RESUME_RESULT = 19,
 
   /**
    * Last event when a search is being suspended;
    * note that "GNUNET_FS_SEARCH_STOPPED" will not
    * be generated in this case.
    */
-  GNUNET_FS_STATUS_SEARCH_SUSPEND,
+  GNUNET_FS_STATUS_SEARCH_SUSPEND = 20,
 
   /**
    * This search has yielded a result.
    */
-  GNUNET_FS_STATUS_SEARCH_RESULT,
+  GNUNET_FS_STATUS_SEARCH_RESULT = 21,
 
   /**
    * We have discovered a new namespace.
    */
-  GNUNET_FS_STATUS_SEARCH_RESULT_NAMESPACE,
+  GNUNET_FS_STATUS_SEARCH_RESULT_NAMESPACE = 22,
 
   /**
    * We have additional data about the quality
    * or availability of a search result.
    */
-  GNUNET_FS_STATUS_SEARCH_UPDATE,
+  GNUNET_FS_STATUS_SEARCH_UPDATE = 23,
 
   /**
    * Signals a problem with this search.
    */
-  GNUNET_FS_STATUS_SEARCH_ERROR,
+  GNUNET_FS_STATUS_SEARCH_ERROR = 24,
 
   /**
    * Signals that this search was paused.
    */
-  GNUNET_FS_STATUS_SEARCH_PAUSED,
+  GNUNET_FS_STATUS_SEARCH_PAUSED = 25,
 
   /**
    * Signals that this search was continued (unpaused).
    */
-  GNUNET_FS_STATUS_SEARCH_CONTINUED,
+  GNUNET_FS_STATUS_SEARCH_CONTINUED = 26,
 
   /**
    * Event generated for each search result
    * when the respective search is stopped.
    */
-  GNUNET_FS_STATUS_SEARCH_RESULT_STOPPED,
+  GNUNET_FS_STATUS_SEARCH_RESULT_STOPPED = 27,
 
   /**
    * Event generated for each search result
    * when the respective search is suspended.
    */
-  GNUNET_FS_STATUS_SEARCH_RESULT_SUSPEND,
+  GNUNET_FS_STATUS_SEARCH_RESULT_SUSPEND = 28,
 
   /**
    * Last message from a search; this signals
    * that there will be no further events associated
    * with this search.
    */
-  GNUNET_FS_STATUS_SEARCH_STOPPED,
+  GNUNET_FS_STATUS_SEARCH_STOPPED = 29,
 
   /**
    * Notification that we started to unindex a file.
    */
-  GNUNET_FS_STATUS_UNINDEX_START,
+  GNUNET_FS_STATUS_UNINDEX_START = 30,
 
   /**
    * Notification that we resumed unindexing of a file.
    */
-  GNUNET_FS_STATUS_UNINDEX_RESUME,
+  GNUNET_FS_STATUS_UNINDEX_RESUME = 31,
 
   /**
    * Notification that we suspended unindexing a file.
    */
-  GNUNET_FS_STATUS_UNINDEX_SUSPEND,
+  GNUNET_FS_STATUS_UNINDEX_SUSPEND = 32,
 
   /**
    * Notification that we made progress unindexing a file.
    */
-  GNUNET_FS_STATUS_UNINDEX_PROGRESS,
+  GNUNET_FS_STATUS_UNINDEX_PROGRESS = 33,
 
   /**
    * Notification that we encountered an error unindexing
    * a file.
    */
-  GNUNET_FS_STATUS_UNINDEX_ERROR,
+  GNUNET_FS_STATUS_UNINDEX_ERROR = 34,
 
   /**
    * Notification that the unindexing of this file
    * was completed.
    */
-  GNUNET_FS_STATUS_UNINDEX_COMPLETED,
+  GNUNET_FS_STATUS_UNINDEX_COMPLETED = 35,
 
   /**
    * Notification that the unindexing of this file
    * was stopped (final event for this action).
    */
-  GNUNET_FS_STATUS_UNINDEX_STOPPED
+  GNUNET_FS_STATUS_UNINDEX_STOPPED = 36
 };
 
 
@@ -791,7 +793,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;
@@ -848,7 +850,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;
@@ -934,7 +936,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;
@@ -1015,11 +1017,16 @@ 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;
 
+          /**
+          * How much trust did we offer for downloading this block?
+          */
+          unsigned int trust_offered;
+
         } progress;
 
         /**
@@ -1250,7 +1257,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).
@@ -1280,7 +1287,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).
@@ -1452,7 +1459,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;
@@ -1502,9 +1509,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
@@ -1621,7 +1628,8 @@ struct GNUNET_FS_BlockOptions
 /**
  * Return the current year (i.e. '2011').
  */
-unsigned int GNUNET_FS_get_current_year (void);
+unsigned int
+GNUNET_FS_get_current_year (void);
 
 
 /**
@@ -1630,7 +1638,18 @@ unsigned int GNUNET_FS_get_current_year (void);
  * @param year a year (after 1970, please ;-)).
  * @return absolute time for January 1st of that year.
  */
-struct GNUNET_TIME_Absolute GNUNET_FS_year_to_time (unsigned int year);
+struct GNUNET_TIME_Absolute
+GNUNET_FS_year_to_time (unsigned int year);
+
+
+/**
+ * Convert an expiration time to the respective year (rounds)
+ *
+ * @param at absolute time 
+ * @return year a year (after 1970), 0 on error
+ */
+unsigned int 
+GNUNET_FS_time_to_year (struct GNUNET_TIME_Absolute at);
 
 
 /**
@@ -1643,19 +1662,17 @@ 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
  * @param ... list of optional options, terminated with GNUNET_FS_OPTIONS_END
  * @return NULL on error
  */
-struct GNUNET_FS_Handle *GNUNET_FS_start (const struct
-                                          GNUNET_CONFIGURATION_Handle *cfg,
-                                          const char *client_name,
-                                          GNUNET_FS_ProgressCallback upcb,
-                                          void *upcb_cls,
-                                          enum GNUNET_FS_Flags flags, ...);
+struct GNUNET_FS_Handle *
+GNUNET_FS_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
+                 const char *client_name, GNUNET_FS_ProgressCallback upcb,
+                 void *upcb_cls, enum GNUNET_FS_Flags flags, ...);
 
 
 /**
@@ -1665,7 +1682,8 @@ struct GNUNET_FS_Handle *GNUNET_FS_start (const struct
  *
  * @param h handle that was returned from GNUNET_FS_start
  */
-void GNUNET_FS_stop (struct GNUNET_FS_Handle *h);
+void
+GNUNET_FS_stop (struct GNUNET_FS_Handle *h);
 
 
 /**
@@ -1677,10 +1695,10 @@ void GNUNET_FS_stop (struct GNUNET_FS_Handle *h);
  * @return GNUNET_SYSERR on error, otherwise the number
  *   of meta-data items obtained
  */
-int GNUNET_FS_meta_data_extract_from_file (struct GNUNET_CONTAINER_MetaData *md,
-                                           const char *filename,
-                                           struct EXTRACTOR_PluginList
-                                           *extractors);
+int
+GNUNET_FS_meta_data_extract_from_file (struct GNUNET_CONTAINER_MetaData *md,
+                                       const char *filename,
+                                       struct EXTRACTOR_PluginList *extractors);
 
 
 /**
@@ -1721,8 +1739,8 @@ typedef int (*GNUNET_FS_FileInformationProcessor) (void *cls,
  *         can be passed to "GNUNET_FS_file_information_recover"
  *         to read this fi-struct from disk.
  */
-const char *GNUNET_FS_file_information_get_id (struct GNUNET_FS_FileInformation
-                                               *s);
+const char *
+GNUNET_FS_file_information_get_id (struct GNUNET_FS_FileInformation *s);
 
 
 
@@ -1740,17 +1758,17 @@ const char *GNUNET_FS_file_information_get_id (struct GNUNET_FS_FileInformation
  * @param bo block options
  * @return publish structure entry for the file
  */
-struct GNUNET_FS_FileInformation
-    *GNUNET_FS_file_information_create_from_file (struct GNUNET_FS_Handle *h,
-                                                  void *client_info,
-                                                  const char *filename,
-                                                  const struct GNUNET_FS_Uri
-                                                  *keywords,
-                                                  const struct
-                                                  GNUNET_CONTAINER_MetaData
-                                                  *meta, int do_index,
-                                                  const struct
-                                                  GNUNET_FS_BlockOptions *bo);
+struct GNUNET_FS_FileInformation *
+GNUNET_FS_file_information_create_from_file (struct GNUNET_FS_Handle *h,
+                                             void *client_info,
+                                             const char *filename,
+                                             const struct GNUNET_FS_Uri
+                                             *keywords,
+                                             const struct
+                                             GNUNET_CONTAINER_MetaData *meta,
+                                             int do_index,
+                                             const struct GNUNET_FS_BlockOptions
+                                             *bo);
 
 
 /**
@@ -1769,17 +1787,17 @@ struct GNUNET_FS_FileInformation
  * @param bo block options
  * @return publish structure entry for the file
  */
-struct GNUNET_FS_FileInformation
-    *GNUNET_FS_file_information_create_from_data (struct GNUNET_FS_Handle *h,
-                                                  void *client_info,
-                                                  uint64_t length, void *data,
-                                                  const struct GNUNET_FS_Uri
-                                                  *keywords,
-                                                  const struct
-                                                  GNUNET_CONTAINER_MetaData
-                                                  *meta, int do_index,
-                                                  const struct
-                                                  GNUNET_FS_BlockOptions *bo);
+struct GNUNET_FS_FileInformation *
+GNUNET_FS_file_information_create_from_data (struct GNUNET_FS_Handle *h,
+                                             void *client_info, uint64_t length,
+                                             void *data,
+                                             const struct GNUNET_FS_Uri
+                                             *keywords,
+                                             const struct
+                                             GNUNET_CONTAINER_MetaData *meta,
+                                             int do_index,
+                                             const struct GNUNET_FS_BlockOptions
+                                             *bo);
 
 
 /**
@@ -1789,7 +1807,7 @@ struct GNUNET_FS_FileInformation
  * @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
@@ -1808,7 +1826,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
@@ -1818,19 +1836,19 @@ typedef size_t (*GNUNET_FS_DataReader) (void *cls, uint64_t offset, size_t max,
  * @param bo block options
  * @return publish structure entry for the file
  */
-struct GNUNET_FS_FileInformation
-    *GNUNET_FS_file_information_create_from_reader (struct GNUNET_FS_Handle *h,
-                                                    void *client_info,
-                                                    uint64_t length,
-                                                    GNUNET_FS_DataReader reader,
-                                                    void *reader_cls,
-                                                    const struct GNUNET_FS_Uri
-                                                    *keywords,
-                                                    const struct
-                                                    GNUNET_CONTAINER_MetaData
-                                                    *meta, int do_index,
-                                                    const struct
-                                                    GNUNET_FS_BlockOptions *bo);
+struct GNUNET_FS_FileInformation *
+GNUNET_FS_file_information_create_from_reader (struct GNUNET_FS_Handle *h,
+                                               void *client_info,
+                                               uint64_t length,
+                                               GNUNET_FS_DataReader reader,
+                                               void *reader_cls,
+                                               const struct GNUNET_FS_Uri
+                                               *keywords,
+                                               const struct
+                                               GNUNET_CONTAINER_MetaData *meta,
+                                               int do_index,
+                                               const struct
+                                               GNUNET_FS_BlockOptions *bo);
 
 
 /**
@@ -1838,7 +1856,7 @@ struct GNUNET_FS_FileInformation
  * 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)
@@ -1849,7 +1867,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
@@ -1876,9 +1894,11 @@ typedef int (*GNUNET_FS_DirectoryScanner) (void *cls,
  * files (those starting with a ".").  Metadata will be extracted
  * using GNU libextractor; the specific list of plugins should be
  * specified in "cls", passing NULL will disable (!)  metadata
- * extraction.  Keywords will be derived from the metadata and be
- * subject to default canonicalization.  This is strictly a
- * convenience function.
+ * extraction.  Keywords will be derived from the metadata and
+ * associated with directories as appropriate.  This is strictly a
+ * convenience function (however, if all tools use it, there will
+ * be less of a chance of distinguishing users by the specific 
+ * user-interface they were using).
  *
  * @param cls must be of type "struct EXTRACTOR_Extractor*"
  * @param h handle to the file sharing subsystem
@@ -1890,11 +1910,12 @@ typedef int (*GNUNET_FS_DirectoryScanner) (void *cls,
  * @param emsg where to store an error message (on errors)
  * @return GNUNET_OK on success
  */
-int GNUNET_FS_directory_scanner_default (void *cls, struct GNUNET_FS_Handle *h,
-                                         const char *dirname, int do_index,
-                                         const struct GNUNET_FS_BlockOptions
-                                         *bo, GNUNET_FS_FileProcessor proc,
-                                         void *proc_cls, char **emsg);
+int
+GNUNET_FS_directory_scanner_default (void *cls, struct GNUNET_FS_Handle *h,
+                                     const char *dirname, int do_index,
+                                     const struct GNUNET_FS_BlockOptions *bo,
+                                     GNUNET_FS_FileProcessor proc,
+                                     void *proc_cls, char **emsg);
 
 
 /**
@@ -1917,17 +1938,16 @@ int GNUNET_FS_directory_scanner_default (void *cls, struct GNUNET_FS_Handle *h,
  * @param emsg where to store an error message
  * @return publish structure entry for the directory, NULL on error
  */
-struct GNUNET_FS_FileInformation
-    *GNUNET_FS_file_information_create_from_directory (struct GNUNET_FS_Handle
-                                                       *h, void *client_info,
-                                                       const char *filename,
-                                                       GNUNET_FS_DirectoryScanner
-                                                       scanner,
-                                                       void *scanner_cls,
-                                                       int do_index,
-                                                       const struct
-                                                       GNUNET_FS_BlockOptions
-                                                       *bo, char **emsg);
+struct GNUNET_FS_FileInformation *
+GNUNET_FS_file_information_create_from_directory (struct GNUNET_FS_Handle *h,
+                                                  void *client_info,
+                                                  const char *filename,
+                                                  GNUNET_FS_DirectoryScanner
+                                                  scanner, void *scanner_cls,
+                                                  int do_index,
+                                                  const struct
+                                                  GNUNET_FS_BlockOptions *bo,
+                                                  char **emsg);
 
 
 /**
@@ -1944,17 +1964,16 @@ struct GNUNET_FS_FileInformation
  * @param bo block options
  * @return publish structure entry for the directory , NULL on error
  */
-struct GNUNET_FS_FileInformation
-    *GNUNET_FS_file_information_create_empty_directory (struct GNUNET_FS_Handle
-                                                        *h, void *client_info,
-                                                        const struct
-                                                        GNUNET_FS_Uri *keywords,
-                                                        const struct
-                                                        GNUNET_CONTAINER_MetaData
-                                                        *meta,
-                                                        const struct
-                                                        GNUNET_FS_BlockOptions
-                                                        *bo);
+struct GNUNET_FS_FileInformation *
+GNUNET_FS_file_information_create_empty_directory (struct GNUNET_FS_Handle *h,
+                                                   void *client_info,
+                                                   const struct GNUNET_FS_Uri
+                                                   *keywords,
+                                                   const struct
+                                                   GNUNET_CONTAINER_MetaData
+                                                   *meta,
+                                                   const struct
+                                                   GNUNET_FS_BlockOptions *bo);
 
 
 /**
@@ -1963,8 +1982,9 @@ struct GNUNET_FS_FileInformation
  * @param ent check if this FI represents a directory
  * @return GNUNET_YES if so, GNUNET_NO if not
  */
-int GNUNET_FS_file_information_is_directory (const struct
-                                             GNUNET_FS_FileInformation *ent);
+int
+GNUNET_FS_file_information_is_directory (const struct GNUNET_FS_FileInformation
+                                         *ent);
 
 
 /**
@@ -1974,12 +1994,13 @@ int GNUNET_FS_file_information_is_directory (const struct
  *
  * @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
  */
-int GNUNET_FS_file_information_add (struct GNUNET_FS_FileInformation *dir,
-                                    struct GNUNET_FS_FileInformation *ent);
+int
+GNUNET_FS_file_information_add (struct GNUNET_FS_FileInformation *dir,
+                                struct GNUNET_FS_FileInformation *ent);
 
 
 /**
@@ -1996,9 +2017,10 @@ int GNUNET_FS_file_information_add (struct GNUNET_FS_FileInformation *dir,
  * @param proc function to call on each entry
  * @param proc_cls closure for proc
  */
-void GNUNET_FS_file_information_inspect (struct GNUNET_FS_FileInformation *dir,
-                                         GNUNET_FS_FileInformationProcessor
-                                         proc, void *proc_cls);
+void
+GNUNET_FS_file_information_inspect (struct GNUNET_FS_FileInformation *dir,
+                                    GNUNET_FS_FileInformationProcessor proc,
+                                    void *proc_cls);
 
 
 /**
@@ -2011,9 +2033,10 @@ void GNUNET_FS_file_information_inspect (struct GNUNET_FS_FileInformation *dir,
  *        values are ignored
  * @param cleaner_cls closure for cleaner
  */
-void GNUNET_FS_file_information_destroy (struct GNUNET_FS_FileInformation *fi,
-                                         GNUNET_FS_FileInformationProcessor
-                                         cleaner, void *cleaner_cls);
+void
+GNUNET_FS_file_information_destroy (struct GNUNET_FS_FileInformation *fi,
+                                    GNUNET_FS_FileInformationProcessor cleaner,
+                                    void *cleaner_cls);
 
 
 /**
@@ -2042,35 +2065,29 @@ 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 *GNUNET_FS_publish_start (struct
-                                                          GNUNET_FS_Handle *h,
-                                                          struct
-                                                          GNUNET_FS_FileInformation
-                                                          *fi,
-                                                          struct
-                                                          GNUNET_FS_Namespace
-                                                          *namespace,
-                                                          const char *nid,
-                                                          const char *nuid,
-                                                          enum
-                                                          GNUNET_FS_PublishOptions
-                                                          options);
+struct GNUNET_FS_PublishContext *
+GNUNET_FS_publish_start (struct GNUNET_FS_Handle *h,
+                         struct GNUNET_FS_FileInformation *fi,
+                         struct GNUNET_FS_Namespace *namespace, const char *nid,
+                         const char *nuid,
+                         enum GNUNET_FS_PublishOptions options);
 
 
 /**
- * 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!
  *
  * @param pc context for the publication to stop
  */
-void GNUNET_FS_publish_stop (struct GNUNET_FS_PublishContext *pc);
+void
+GNUNET_FS_publish_stop (struct GNUNET_FS_PublishContext *pc);
 
 
 /**
@@ -2098,13 +2115,14 @@ typedef void (*GNUNET_FS_PublishContinuation) (void *cls,
  * @param cont continuation
  * @param cont_cls closure for cont
  */
-void GNUNET_FS_publish_ksk (struct GNUNET_FS_Handle *h,
-                            const struct GNUNET_FS_Uri *ksk_uri,
-                            const struct GNUNET_CONTAINER_MetaData *meta,
-                            const struct GNUNET_FS_Uri *uri,
-                            const struct GNUNET_FS_BlockOptions *bo,
-                            enum GNUNET_FS_PublishOptions options,
-                            GNUNET_FS_PublishContinuation cont, void *cont_cls);
+void
+GNUNET_FS_publish_ksk (struct GNUNET_FS_Handle *h,
+                       const struct GNUNET_FS_Uri *ksk_uri,
+                       const struct GNUNET_CONTAINER_MetaData *meta,
+                       const struct GNUNET_FS_Uri *uri,
+                       const struct GNUNET_FS_BlockOptions *bo,
+                       enum GNUNET_FS_PublishOptions options,
+                       GNUNET_FS_PublishContinuation cont, void *cont_cls);
 
 
 /**
@@ -2121,14 +2139,15 @@ void GNUNET_FS_publish_ksk (struct GNUNET_FS_Handle *h,
  * @param cont continuation
  * @param cont_cls closure for cont
  */
-void GNUNET_FS_publish_sks (struct GNUNET_FS_Handle *h,
-                            struct GNUNET_FS_Namespace *namespace,
-                            const char *identifier, const char *update,
-                            const struct GNUNET_CONTAINER_MetaData *meta,
-                            const struct GNUNET_FS_Uri *uri,
-                            const struct GNUNET_FS_BlockOptions *bo,
-                            enum GNUNET_FS_PublishOptions options,
-                            GNUNET_FS_PublishContinuation cont, void *cont_cls);
+void
+GNUNET_FS_publish_sks (struct GNUNET_FS_Handle *h,
+                       struct GNUNET_FS_Namespace *namespace,
+                       const char *identifier, const char *update,
+                       const struct GNUNET_CONTAINER_MetaData *meta,
+                       const struct GNUNET_FS_Uri *uri,
+                       const struct GNUNET_FS_BlockOptions *bo,
+                       enum GNUNET_FS_PublishOptions options,
+                       GNUNET_FS_PublishContinuation cont, void *cont_cls);
 
 
 /**
@@ -2154,10 +2173,11 @@ typedef int (*GNUNET_FS_IndexedFileProcessor) (void *cls, const char *filename,
  *             error) or  "PREREQ_DONE" (on success)
  * @param cont_cls closure for cont
  */
-void GNUNET_FS_get_indexed_files (struct GNUNET_FS_Handle *h,
-                                  GNUNET_FS_IndexedFileProcessor iterator,
-                                  void *iterator_cls,
-                                  GNUNET_SCHEDULER_Task cont, void *cont_cls);
+void
+GNUNET_FS_get_indexed_files (struct GNUNET_FS_Handle *h,
+                             GNUNET_FS_IndexedFileProcessor iterator,
+                             void *iterator_cls, GNUNET_SCHEDULER_Task cont,
+                             void *cont_cls);
 
 
 /**
@@ -2166,12 +2186,11 @@ void 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,
-                                                          void *cctx);
+struct GNUNET_FS_UnindexContext *
+GNUNET_FS_unindex_start (struct GNUNET_FS_Handle *h, const char *filename,
+                         void *cctx);
 
 
 /**
@@ -2179,11 +2198,12 @@ struct GNUNET_FS_UnindexContext *GNUNET_FS_unindex_start (struct
  *
  * @param uc handle
  */
-void GNUNET_FS_unindex_stop (struct GNUNET_FS_UnindexContext *uc);
+void
+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
@@ -2194,15 +2214,15 @@ void GNUNET_FS_unindex_stop (struct GNUNET_FS_UnindexContext *uc);
  * @param cont continuation
  * @param cont_cls closure for cont
  */
-void GNUNET_FS_namespace_advertise (struct GNUNET_FS_Handle *h,
-                                    struct GNUNET_FS_Uri *ksk_uri,
-                                    struct GNUNET_FS_Namespace *namespace,
-                                    const struct GNUNET_CONTAINER_MetaData
-                                    *meta,
-                                    const struct GNUNET_FS_BlockOptions *bo,
-                                    const char *rootEntry,
-                                    GNUNET_FS_PublishContinuation cont,
-                                    void *cont_cls);
+void
+GNUNET_FS_namespace_advertise (struct GNUNET_FS_Handle *h,
+                               struct GNUNET_FS_Uri *ksk_uri,
+                               struct GNUNET_FS_Namespace *namespace,
+                               const struct GNUNET_CONTAINER_MetaData *meta,
+                               const struct GNUNET_FS_BlockOptions *bo,
+                               const char *rootEntry,
+                               GNUNET_FS_PublishContinuation cont,
+                               void *cont_cls);
 
 
 /**
@@ -2213,8 +2233,8 @@ void GNUNET_FS_namespace_advertise (struct GNUNET_FS_Handle *h,
  * @param name name to use for the namespace
  * @return handle to the namespace, NULL on error
  */
-struct GNUNET_FS_Namespace *GNUNET_FS_namespace_create (struct GNUNET_FS_Handle
-                                                        *h, const char *name);
+struct GNUNET_FS_Namespace *
+GNUNET_FS_namespace_create (struct GNUNET_FS_Handle *h, const char *name);
 
 
 /**
@@ -2228,8 +2248,8 @@ struct GNUNET_FS_Namespace *GNUNET_FS_namespace_create (struct GNUNET_FS_Handle
  *
  * @return GNUNET_OK on success, GNUNET_SYSERR on error
  */
-int GNUNET_FS_namespace_delete (struct GNUNET_FS_Namespace *namespace,
-                                int freeze);
+int
+GNUNET_FS_namespace_delete (struct GNUNET_FS_Namespace *namespace, int freeze);
 
 
 /**
@@ -2254,16 +2274,16 @@ typedef void (*GNUNET_FS_NamespaceInfoProcessor) (void *cls, const char *name,
  * @param cb function to call on each known namespace
  * @param cb_cls closure for cb
  */
-void GNUNET_FS_namespace_list (struct GNUNET_FS_Handle *h,
-                               GNUNET_FS_NamespaceInfoProcessor cb,
-                               void *cb_cls);
+void
+GNUNET_FS_namespace_list (struct GNUNET_FS_Handle *h,
+                          GNUNET_FS_NamespaceInfoProcessor cb, void *cb_cls);
 
 
 /**
  * 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
@@ -2281,12 +2301,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).
@@ -2296,10 +2316,11 @@ typedef void (*GNUNET_FS_IdentifierProcessor) (void *cls, const char *last_id,
  * @param ip function to call on each updateable identifier
  * @param ip_cls closure for ip
  */
-void GNUNET_FS_namespace_list_updateable (struct GNUNET_FS_Namespace *namespace,
-                                          const char *next_id,
-                                          GNUNET_FS_IdentifierProcessor ip,
-                                          void *ip_cls);
+void
+GNUNET_FS_namespace_list_updateable (struct GNUNET_FS_Namespace *namespace,
+                                     const char *next_id,
+                                     GNUNET_FS_IdentifierProcessor ip,
+                                     void *ip_cls);
 
 
 /**
@@ -2331,22 +2352,19 @@ enum GNUNET_FS_SearchOptions
  * @param cctx initial value for the client context
  * @return context that can be used to control the search
  */
-struct GNUNET_FS_SearchContext *GNUNET_FS_search_start (struct GNUNET_FS_Handle
-                                                        *h,
-                                                        const struct
-                                                        GNUNET_FS_Uri *uri,
-                                                        uint32_t anonymity,
-                                                        enum
-                                                        GNUNET_FS_SearchOptions
-                                                        options, void *cctx);
+struct GNUNET_FS_SearchContext *
+GNUNET_FS_search_start (struct GNUNET_FS_Handle *h,
+                        const struct GNUNET_FS_Uri *uri, uint32_t anonymity,
+                        enum GNUNET_FS_SearchOptions options, void *cctx);
 
 
 /**
- * Pause search.  
+ * Pause search.
  *
  * @param sc context for the search that should be paused
  */
-void GNUNET_FS_search_pause (struct GNUNET_FS_SearchContext *sc);
+void
+GNUNET_FS_search_pause (struct GNUNET_FS_SearchContext *sc);
 
 
 /**
@@ -2354,7 +2372,8 @@ void GNUNET_FS_search_pause (struct GNUNET_FS_SearchContext *sc);
  *
  * @param sc context for the search that should be resumed
  */
-void GNUNET_FS_search_continue (struct GNUNET_FS_SearchContext *sc);
+void
+GNUNET_FS_search_continue (struct GNUNET_FS_SearchContext *sc);
 
 
 /**
@@ -2362,7 +2381,8 @@ void GNUNET_FS_search_continue (struct GNUNET_FS_SearchContext *sc);
  *
  * @param sc context for the search that should be stopped
  */
-void GNUNET_FS_search_stop (struct GNUNET_FS_SearchContext *sc);
+void
+GNUNET_FS_search_stop (struct GNUNET_FS_SearchContext *sc);
 
 
 
@@ -2437,26 +2457,14 @@ enum GNUNET_FS_DownloadOptions
  *        for top-level downloads; useful for manually-triggered recursive downloads)
  * @return context that can be used to control this download
  */
-struct GNUNET_FS_DownloadContext *GNUNET_FS_download_start (struct
-                                                            GNUNET_FS_Handle *h,
-                                                            const struct
-                                                            GNUNET_FS_Uri *uri,
-                                                            const struct
-                                                            GNUNET_CONTAINER_MetaData
-                                                            *meta,
-                                                            const char
-                                                            *filename,
-                                                            const char
-                                                            *tempname,
-                                                            uint64_t offset,
-                                                            uint64_t length,
-                                                            uint32_t anonymity,
-                                                            enum
-                                                            GNUNET_FS_DownloadOptions
-                                                            options, void *cctx,
-                                                            struct
-                                                            GNUNET_FS_DownloadContext
-                                                            *parent);
+struct GNUNET_FS_DownloadContext *
+GNUNET_FS_download_start (struct GNUNET_FS_Handle *h,
+                          const struct GNUNET_FS_Uri *uri,
+                          const struct GNUNET_CONTAINER_MetaData *meta,
+                          const char *filename, const char *tempname,
+                          uint64_t offset, uint64_t length, uint32_t anonymity,
+                          enum GNUNET_FS_DownloadOptions options, void *cctx,
+                          struct GNUNET_FS_DownloadContext *parent);
 
 
 /**
@@ -2493,29 +2501,14 @@ struct GNUNET_FS_DownloadContext *GNUNET_FS_download_start (struct
  * @param cctx initial value for the client context for this download
  * @return context that can be used to control this download
  */
-struct GNUNET_FS_DownloadContext *GNUNET_FS_download_start_from_search (struct
-                                                                        GNUNET_FS_Handle
-                                                                        *h,
-                                                                        struct
-                                                                        GNUNET_FS_SearchResult
-                                                                        *sr,
-                                                                        const
-                                                                        char
-                                                                        *filename,
-                                                                        const
-                                                                        char
-                                                                        *tempname,
-                                                                        uint64_t
-                                                                        offset,
-                                                                        uint64_t
-                                                                        length,
-                                                                        uint32_t
-                                                                        anonymity,
-                                                                        enum
-                                                                        GNUNET_FS_DownloadOptions
-                                                                        options,
-                                                                        void
-                                                                        *cctx);
+struct GNUNET_FS_DownloadContext *
+GNUNET_FS_download_start_from_search (struct GNUNET_FS_Handle *h,
+                                      struct GNUNET_FS_SearchResult *sr,
+                                      const char *filename,
+                                      const char *tempname, uint64_t offset,
+                                      uint64_t length, uint32_t anonymity,
+                                      enum GNUNET_FS_DownloadOptions options,
+                                      void *cctx);
 
 
 /**
@@ -2524,8 +2517,8 @@ struct GNUNET_FS_DownloadContext *GNUNET_FS_download_start_from_search (struct
  * @param dc handle for the download
  * @param do_delete delete files of incomplete downloads
  */
-void GNUNET_FS_download_stop (struct GNUNET_FS_DownloadContext *dc,
-                              int do_delete);
+void
+GNUNET_FS_download_stop (struct GNUNET_FS_DownloadContext *dc, int do_delete);
 
 
 
@@ -2543,27 +2536,30 @@ void GNUNET_FS_download_stop (struct GNUNET_FS_DownloadContext *dc,
  * @return GNUNET_YES if it is, GNUNET_NO if it is not, GNUNET_SYSERR if
  *  we have no mime-type information (treat as 'GNUNET_NO')
  */
-int GNUNET_FS_meta_data_test_for_directory (const struct
-                                            GNUNET_CONTAINER_MetaData *md);
+int
+GNUNET_FS_meta_data_test_for_directory (const struct GNUNET_CONTAINER_MetaData
+                                        *md);
 
 
 /**
  * Set the MIMETYPE information for the given
  * metadata to "application/gnunet-directory".
- * 
+ *
  * @param md metadata to add mimetype to
  */
-void GNUNET_FS_meta_data_make_directory (struct GNUNET_CONTAINER_MetaData *md);
+void
+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
  */
-char *GNUNET_FS_meta_data_suggest_filename (const struct
-                                            GNUNET_CONTAINER_MetaData *md);
+char *
+GNUNET_FS_meta_data_suggest_filename (const struct GNUNET_CONTAINER_MetaData
+                                      *md);
 
 
 /**
@@ -2610,10 +2606,11 @@ typedef void (*GNUNET_FS_DirectoryEntryProcessor) (void *cls,
  *         GNUNET_NO if this could be part of a directory (but not 100% OK)
  *         GNUNET_SYSERR if 'data' does not represent a directory
  */
-int GNUNET_FS_directory_list_contents (size_t size, const void *data,
-                                       uint64_t offset,
-                                       GNUNET_FS_DirectoryEntryProcessor dep,
-                                       void *dep_cls);
+int
+GNUNET_FS_directory_list_contents (size_t size, const void *data,
+                                   uint64_t offset,
+                                   GNUNET_FS_DirectoryEntryProcessor dep,
+                                   void *dep_cls);
 
 
 /**
@@ -2623,18 +2620,17 @@ struct GNUNET_FS_DirectoryBuilder;
 
 /**
  * Create a directory builder.
- * 
+ *
  * @param mdir metadata for the directory
  */
-struct GNUNET_FS_DirectoryBuilder *GNUNET_FS_directory_builder_create (const
-                                                                       struct
-                                                                       GNUNET_CONTAINER_MetaData
-                                                                       *mdir);
+struct GNUNET_FS_DirectoryBuilder *
+GNUNET_FS_directory_builder_create (const struct GNUNET_CONTAINER_MetaData
+                                    *mdir);
 
 
 /**
  * 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
@@ -2642,10 +2638,11 @@ struct GNUNET_FS_DirectoryBuilder *GNUNET_FS_directory_builder_create (const
  *        data must point to exactly the number of bytes specified
  *        by the uri
  */
-void GNUNET_FS_directory_builder_add (struct GNUNET_FS_DirectoryBuilder *bld,
-                                      const struct GNUNET_FS_Uri *uri,
-                                      const struct GNUNET_CONTAINER_MetaData
-                                      *md, const void *data);
+void
+GNUNET_FS_directory_builder_add (struct GNUNET_FS_DirectoryBuilder *bld,
+                                 const struct GNUNET_FS_Uri *uri,
+                                 const struct GNUNET_CONTAINER_MetaData *md,
+                                 const void *data);
 
 
 /**
@@ -2658,8 +2655,9 @@ void GNUNET_FS_directory_builder_add (struct GNUNET_FS_DirectoryBuilder *bld,
  * @param rdata set to the encoded directory
  * @return GNUNET_OK on success
  */
-int GNUNET_FS_directory_builder_finish (struct GNUNET_FS_DirectoryBuilder *bld,
-                                        size_t * rsize, void **rdata);
+int
+GNUNET_FS_directory_builder_finish (struct GNUNET_FS_DirectoryBuilder *bld,
+                                    size_t * rsize, void **rdata);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */