1 files changed, 91 insertions, 140 deletions

diff --git a/src/fs/fs_api.h b/src/fs/fs_api.h
index ad054ef06..dcc487eb1 100644
--- a/src/fs/fs_api.h
+++ b/src/fs/fs_api.h
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @file fs/fs_api.h
@@ -90,9 +90,7 @@
  * @brief complete information needed
  * to download a file.
  */
-struct FileIdentifier
-{
-
+struct FileIdentifier {
   /**
    * Total size of the file in bytes. (network byte order (!))
    */
@@ -102,7 +100,6 @@ struct FileIdentifier
    * Query and key of the top GNUNET_EC_IBlock.
    */
   struct ContentHashKey chk;
-
 };
 
 
@@ -110,8 +107,7 @@ struct FileIdentifier
  * Information about a file and its location
  * (peer claiming to share the file).
  */
-struct Location
-{
+struct Location {
   /**
    * Information about the shared file.
    */
@@ -132,14 +128,12 @@ struct Location
    * peer identity and expiration time.
    */
   struct GNUNET_CRYPTO_EddsaSignature contentSignature;
-
 };
 
 /**
  * Types of URIs.
  */
-enum GNUNET_FS_UriType
-{
+enum GNUNET_FS_UriType {
   /**
    * Content-hash-key (simple file).
    */
@@ -165,17 +159,14 @@ enum GNUNET_FS_UriType
 /**
  * A Universal Resource Identifier (URI), opaque.
  */
-struct GNUNET_FS_Uri
-{
+struct GNUNET_FS_Uri {
   /**
    * Type of the URI.
    */
   enum GNUNET_FS_UriType type;
 
-  union
-  {
-    struct
-    {
+  union {
+    struct {
       /**
        * Keywords start with a '+' if they are mandatory (in which
        * case the '+' is NOT part of the keyword) and with a simple
@@ -193,8 +184,7 @@ struct GNUNET_FS_Uri
       unsigned int keywordCount;
     } ksk;
 
-    struct
-    {
+    struct {
       /**
        * Identifier of the namespace.
        */
@@ -205,7 +195,6 @@ struct GNUNET_FS_Uri
        * namespace.
        */
       char *identifier;
-
     } sks;
 
     /**
@@ -220,7 +209,6 @@ struct GNUNET_FS_Uri
      */
     struct Location loc;
   } data;
-
 };
 
 
@@ -228,9 +216,7 @@ struct GNUNET_FS_Uri
  * Information for a file or directory that is
  * about to be published.
  */
-struct GNUNET_FS_FileInformation
-{
-
+struct GNUNET_FS_FileInformation {
   /**
    * Files in a directory are kept as a linked list.
    */
@@ -309,15 +295,11 @@ struct GNUNET_FS_FileInformation
   /**
    * Data describing either the file or the directory.
    */
-  union
-  {
-
+  union {
     /**
      * Data for a file.
      */
-    struct
-    {
-
+    struct {
       /**
        * Function that can be used to read the data for the file.
        */
@@ -356,15 +338,12 @@ struct GNUNET_FS_FileInformation
        * #GNUNET_YES if this step has been completed.
        */
       int index_start_confirmed;
-
     } file;
 
     /**
      * Data for a directory.
      */
-    struct
-    {
-
+    struct {
       /**
        * Linked list of entries in the directory.
        */
@@ -391,9 +370,7 @@ struct GNUNET_FS_FileInformation
        * Sum of all of the sizes of all of the files in the directory.
        */
       uint64_t contents_size;
-
     } dir;
-
   } data;
 
   /**
@@ -405,15 +382,13 @@ struct GNUNET_FS_FileInformation
    * Are we done publishing this file?
    */
   int is_published;
-
 };
 
 
 /**
  * Priorities for the queue.
  */
-enum GNUNET_FS_QueuePriority
-{
+enum GNUNET_FS_QueuePriority {
   /**
    * This is a probe (low priority).
    */
@@ -429,8 +404,7 @@ enum GNUNET_FS_QueuePriority
 /**
  * Entry in the job queue.
  */
-struct GNUNET_FS_QueueEntry
-{
+struct GNUNET_FS_QueueEntry {
   /**
    * This is a linked list.
    */
@@ -501,16 +475,13 @@ struct GNUNET_FS_QueueEntry
    * #GNUNET_YES if the job is active now.
    */
   int active;
-
 };
 
 
 /**
  * Information we store for each search result.
  */
-struct GNUNET_FS_SearchResult
-{
-
+struct GNUNET_FS_SearchResult {
   /**
    * File-sharing context this result belongs to.
    */
@@ -625,7 +596,6 @@ struct GNUNET_FS_SearchResult
    * search result.
    */
   uint32_t availability_trials;
-
 };
 
 
@@ -641,12 +611,12 @@ struct GNUNET_FS_SearchResult
  * @return queue handle
  */
 struct GNUNET_FS_QueueEntry *
-GNUNET_FS_queue_ (struct GNUNET_FS_Handle *h,
-                  GNUNET_SCHEDULER_TaskCallback start,
-                  GNUNET_SCHEDULER_TaskCallback stop,
-                  void *cls,
-                  unsigned int blocks,
-                  enum GNUNET_FS_QueuePriority priority);
+GNUNET_FS_queue_(struct GNUNET_FS_Handle *h,
+                 GNUNET_SCHEDULER_TaskCallback start,
+                 GNUNET_SCHEDULER_TaskCallback stop,
+                 void *cls,
+                 unsigned int blocks,
+                 enum GNUNET_FS_QueuePriority priority);
 
 
 /**
@@ -655,7 +625,7 @@ GNUNET_FS_queue_ (struct GNUNET_FS_Handle *h,
  * @param qe handle for the job
  */
 void
-GNUNET_FS_dequeue_ (struct GNUNET_FS_QueueEntry *qe);
+GNUNET_FS_dequeue_(struct GNUNET_FS_QueueEntry *qe);
 
 
 /**
@@ -675,11 +645,11 @@ GNUNET_FS_dequeue_ (struct GNUNET_FS_QueueEntry *qe);
  * @return number of bytes written, usually "max", 0 on error
  */
 size_t
-GNUNET_FS_data_reader_file_ (void *cls,
-                             uint64_t offset,
-                             size_t max,
-                             void *buf,
-                             char **emsg);
+GNUNET_FS_data_reader_file_(void *cls,
+                            uint64_t offset,
+                            size_t max,
+                            void *buf,
+                            char **emsg);
 
 
 /**
@@ -689,7 +659,7 @@ GNUNET_FS_data_reader_file_ (void *cls,
  * @return closure to use
  */
 void *
-GNUNET_FS_make_file_reader_context_ (const char *filename);
+GNUNET_FS_make_file_reader_context_(const char *filename);
 
 
 
@@ -710,11 +680,11 @@ GNUNET_FS_make_file_reader_context_ (const char *filename);
  * @return number of bytes written, usually @a max, 0 on error
  */
 size_t
-GNUNET_FS_data_reader_copy_ (void *cls,
-                             uint64_t offset,
-                             size_t max,
-                             void *buf,
-                             char **emsg);
+GNUNET_FS_data_reader_copy_(void *cls,
+                            uint64_t offset,
+                            size_t max,
+                            void *buf,
+                            char **emsg);
 
 
 /**
@@ -733,8 +703,8 @@ GNUNET_FS_data_reader_copy_ (void *cls,
  *         field in the `struct GNUNET_FS_ProgressInfo`.
  */
 void *
-GNUNET_FS_search_probe_progress_ (void *cls,
-                                  const struct GNUNET_FS_ProgressInfo *info);
+GNUNET_FS_search_probe_progress_(void *cls,
+                                 const struct GNUNET_FS_ProgressInfo *info);
 
 
 /**
@@ -743,7 +713,7 @@ GNUNET_FS_search_probe_progress_ (void *cls,
  * @param cls `struct GNUNET_FS_PublishContext` identifies the upload
  */
 void
-GNUNET_FS_publish_main_ (void *cls);
+GNUNET_FS_publish_main_(void *cls);
 
 
 /**
@@ -754,8 +724,8 @@ GNUNET_FS_publish_main_ (void *cls);
  * @param file_id computed hash, NULL on error
  */
 void
-GNUNET_FS_unindex_process_hash_ (void *cls,
-                                 const struct GNUNET_HashCode *file_id);
+GNUNET_FS_unindex_process_hash_(void *cls,
+                                const struct GNUNET_HashCode *file_id);
 
 
 /**
@@ -764,7 +734,7 @@ GNUNET_FS_unindex_process_hash_ (void *cls,
  * @param uc context for the unindex operation.
  */
 void
-GNUNET_FS_unindex_do_extract_keywords_ (struct GNUNET_FS_UnindexContext *uc);
+GNUNET_FS_unindex_do_extract_keywords_(struct GNUNET_FS_UnindexContext *uc);
 
 
 /**
@@ -773,7 +743,7 @@ GNUNET_FS_unindex_do_extract_keywords_ (struct GNUNET_FS_UnindexContext *uc);
  * @param uc context for the unindex operation.
  */
 void
-GNUNET_FS_unindex_do_remove_kblocks_ (struct GNUNET_FS_UnindexContext *uc);
+GNUNET_FS_unindex_do_remove_kblocks_(struct GNUNET_FS_UnindexContext *uc);
 
 
 /**
@@ -787,10 +757,10 @@ GNUNET_FS_unindex_do_remove_kblocks_ (struct GNUNET_FS_UnindexContext *uc);
  * @return value returned from callback
  */
 void *
-GNUNET_FS_publish_make_status_ (struct GNUNET_FS_ProgressInfo *pi,
-                                struct GNUNET_FS_PublishContext *pc,
-                                const struct GNUNET_FS_FileInformation *p,
-                                uint64_t offset);
+GNUNET_FS_publish_make_status_(struct GNUNET_FS_ProgressInfo *pi,
+                               struct GNUNET_FS_PublishContext *pc,
+                               const struct GNUNET_FS_FileInformation *p,
+                               uint64_t offset);
 
 
 /**
@@ -801,8 +771,8 @@ GNUNET_FS_publish_make_status_ (struct GNUNET_FS_ProgressInfo *pi,
  * @param dc overall download context
  */
 void
-GNUNET_FS_download_make_status_ (struct GNUNET_FS_ProgressInfo *pi,
-                                 struct GNUNET_FS_DownloadContext *dc);
+GNUNET_FS_download_make_status_(struct GNUNET_FS_ProgressInfo *pi,
+                                struct GNUNET_FS_DownloadContext *dc);
 
 
 /**
@@ -812,7 +782,7 @@ GNUNET_FS_download_make_status_ (struct GNUNET_FS_ProgressInfo *pi,
  * @param cls the 'struct GNUNET_FS_DownloadContext'
  */
 void
-GNUNET_FS_download_start_task_ (void *cls);
+GNUNET_FS_download_start_task_(void *cls);
 
 
 
@@ -825,9 +795,9 @@ GNUNET_FS_download_start_task_ (void *cls);
  * @param offset where we are in the file (for progress)
  */
 void
-GNUNET_FS_unindex_make_status_ (struct GNUNET_FS_ProgressInfo *pi,
-                                struct GNUNET_FS_UnindexContext *uc,
-                                uint64_t offset);
+GNUNET_FS_unindex_make_status_(struct GNUNET_FS_ProgressInfo *pi,
+                               struct GNUNET_FS_UnindexContext *uc,
+                               uint64_t offset);
 
 /**
  * Fill in all of the generic fields for a search event and
@@ -839,9 +809,9 @@ GNUNET_FS_unindex_make_status_ (struct GNUNET_FS_ProgressInfo *pi,
  * @return value returned by the callback
  */
 void *
-GNUNET_FS_search_make_status_ (struct GNUNET_FS_ProgressInfo *pi,
-                               struct GNUNET_FS_Handle *h,
-                               struct GNUNET_FS_SearchContext *sc);
+GNUNET_FS_search_make_status_(struct GNUNET_FS_ProgressInfo *pi,
+                              struct GNUNET_FS_Handle *h,
+                              struct GNUNET_FS_SearchContext *sc);
 
 
 /**
@@ -850,7 +820,7 @@ GNUNET_FS_search_make_status_ (struct GNUNET_FS_ProgressInfo *pi,
  * @param uc context for the unindex operation.
  */
 void
-GNUNET_FS_unindex_do_remove_ (struct GNUNET_FS_UnindexContext *uc);
+GNUNET_FS_unindex_do_remove_(struct GNUNET_FS_UnindexContext *uc);
 
 /**
  * Build the request and actually initiate the search using the
@@ -860,7 +830,7 @@ GNUNET_FS_unindex_do_remove_ (struct GNUNET_FS_UnindexContext *uc);
  * @return GNUNET_OK on success, GNUNET_SYSERR on error
  */
 int
-GNUNET_FS_search_start_searching_ (struct GNUNET_FS_SearchContext *sc);
+GNUNET_FS_search_start_searching_(struct GNUNET_FS_SearchContext *sc);
 
 /**
  * Start the downloading process (by entering the queue).
@@ -868,7 +838,7 @@ GNUNET_FS_search_start_searching_ (struct GNUNET_FS_SearchContext *sc);
  * @param dc our download context
  */
 void
-GNUNET_FS_download_start_downloading_ (struct GNUNET_FS_DownloadContext *dc);
+GNUNET_FS_download_start_downloading_(struct GNUNET_FS_DownloadContext *dc);
 
 
 /**
@@ -877,7 +847,7 @@ GNUNET_FS_download_start_downloading_ (struct GNUNET_FS_DownloadContext *dc);
  * @param sr the search result
  */
 void
-GNUNET_FS_search_start_probe_ (struct GNUNET_FS_SearchResult *sr);
+GNUNET_FS_search_start_probe_(struct GNUNET_FS_SearchResult *sr);
 
 
 /**
@@ -888,9 +858,9 @@ GNUNET_FS_search_start_probe_ (struct GNUNET_FS_SearchResult *sr);
  * @param ent entity identifier
  */
 void
-GNUNET_FS_remove_sync_file_ (struct GNUNET_FS_Handle *h,
-                             const char *ext,
-                             const char *ent);
+GNUNET_FS_remove_sync_file_(struct GNUNET_FS_Handle *h,
+                            const char *ext,
+                            const char *ent);
 
 
 /**
@@ -901,9 +871,9 @@ GNUNET_FS_remove_sync_file_ (struct GNUNET_FS_Handle *h,
  * @param uni unique name of parent
  */
 void
-GNUNET_FS_remove_sync_dir_ (struct GNUNET_FS_Handle *h,
-                            const char *ext,
-                            const char *uni);
+GNUNET_FS_remove_sync_dir_(struct GNUNET_FS_Handle *h,
+                           const char *ext,
+                           const char *uni);
 
 
 /**
@@ -915,7 +885,7 @@ GNUNET_FS_remove_sync_dir_ (struct GNUNET_FS_Handle *h,
  * @param fi the struct to sync
  */
 void
-GNUNET_FS_file_information_sync_ (struct GNUNET_FS_FileInformation *f);
+GNUNET_FS_file_information_sync_(struct GNUNET_FS_FileInformation *f);
 
 
 /**
@@ -927,7 +897,7 @@ GNUNET_FS_file_information_sync_ (struct GNUNET_FS_FileInformation *f);
  * @param pc the struct to sync
  */
 void
-GNUNET_FS_publish_sync_ (struct GNUNET_FS_PublishContext *pc);
+GNUNET_FS_publish_sync_(struct GNUNET_FS_PublishContext *pc);
 
 
 /**
@@ -939,7 +909,7 @@ GNUNET_FS_publish_sync_ (struct GNUNET_FS_PublishContext *pc);
  * @param uc the struct to sync
  */
 void
-GNUNET_FS_unindex_sync_ (struct GNUNET_FS_UnindexContext *uc);
+GNUNET_FS_unindex_sync_(struct GNUNET_FS_UnindexContext *uc);
 
 
 /**
@@ -951,7 +921,7 @@ GNUNET_FS_unindex_sync_ (struct GNUNET_FS_UnindexContext *uc);
  * @param sc the struct to sync
  */
 void
-GNUNET_FS_search_sync_ (struct GNUNET_FS_SearchContext *sc);
+GNUNET_FS_search_sync_(struct GNUNET_FS_SearchContext *sc);
 
 
 /**
@@ -963,7 +933,7 @@ GNUNET_FS_search_sync_ (struct GNUNET_FS_SearchContext *sc);
  * @param sr the struct to sync
  */
 void
-GNUNET_FS_search_result_sync_ (struct GNUNET_FS_SearchResult *sr);
+GNUNET_FS_search_result_sync_(struct GNUNET_FS_SearchResult *sr);
 
 
 /**
@@ -975,7 +945,7 @@ GNUNET_FS_search_result_sync_ (struct GNUNET_FS_SearchResult *sr);
  * @param dc the struct to sync
  */
 void
-GNUNET_FS_download_sync_ (struct GNUNET_FS_DownloadContext *dc);
+GNUNET_FS_download_sync_(struct GNUNET_FS_DownloadContext *dc);
 
 
 /**
@@ -985,7 +955,7 @@ GNUNET_FS_download_sync_ (struct GNUNET_FS_DownloadContext *dc);
  * @param cls the `struct GNUNET_FS_PublishContext` to signal for
  */
 void
-GNUNET_FS_publish_signal_suspend_ (void *cls);
+GNUNET_FS_publish_signal_suspend_(void *cls);
 
 
 /**
@@ -995,7 +965,7 @@ GNUNET_FS_publish_signal_suspend_ (void *cls);
  * @param cls the 'struct GNUNET_FS_SearchContext' to signal for
  */
 void
-GNUNET_FS_search_signal_suspend_ (void *cls);
+GNUNET_FS_search_signal_suspend_(void *cls);
 
 
 /**
@@ -1005,7 +975,7 @@ GNUNET_FS_search_signal_suspend_ (void *cls);
  * @param cls the `struct GNUNET_FS_DownloadContext` to signal for
  */
 void
-GNUNET_FS_download_signal_suspend_ (void *cls);
+GNUNET_FS_download_signal_suspend_(void *cls);
 
 
 /**
@@ -1015,7 +985,7 @@ GNUNET_FS_download_signal_suspend_ (void *cls);
  * @param cls the `struct GNUNET_FS_UnindexContext` to signal for
  */
 void
-GNUNET_FS_unindex_signal_suspend_ (void *cls);
+GNUNET_FS_unindex_signal_suspend_(void *cls);
 
 
 /**
@@ -1031,8 +1001,7 @@ typedef void (*SuspendSignalFunction) (void *cls);
  * We track all of the top-level activities of FS
  * so that we can signal 'suspend' on shutdown.
  */
-struct TopLevelActivity
-{
+struct TopLevelActivity {
   /**
    * This is a doubly-linked list.
    */
@@ -1064,9 +1033,9 @@ struct TopLevelActivity
  * @return fresh top-level activity handle
  */
 struct TopLevelActivity *
-GNUNET_FS_make_top (struct GNUNET_FS_Handle *h,
-                    SuspendSignalFunction ssf,
-                    void *ssf_cls);
+GNUNET_FS_make_top(struct GNUNET_FS_Handle *h,
+                   SuspendSignalFunction ssf,
+                   void *ssf_cls);
 
 
 /**
@@ -1076,16 +1045,15 @@ GNUNET_FS_make_top (struct GNUNET_FS_Handle *h,
  * @param top top level activity entry
  */
 void
-GNUNET_FS_end_top (struct GNUNET_FS_Handle *h,
-                   struct TopLevelActivity *top);
+GNUNET_FS_end_top(struct GNUNET_FS_Handle *h,
+                  struct TopLevelActivity *top);
 
 
 
 /**
  * Master context for most FS operations.
  */
-struct GNUNET_FS_Handle
-{
+struct GNUNET_FS_Handle {
   /**
    * Configuration to use.
    */
@@ -1188,15 +1156,13 @@ struct GNUNET_FS_Handle
    * Maximum number of parallel requests.
    */
   unsigned int max_parallel_requests;
-
 };
 
 
 /**
  * Handle for controlling a publication process.
  */
-struct GNUNET_FS_PublishContext
-{
+struct GNUNET_FS_PublishContext {
   /**
    * Handle to the global fs context.
    */
@@ -1322,8 +1288,7 @@ struct GNUNET_FS_PublishContext
 /**
  * Phases of unindex processing (state machine).
  */
-enum UnindexState
-{
+enum UnindexState {
   /**
    * We're currently hashing the file.
    */
@@ -1366,9 +1331,7 @@ enum UnindexState
 /**
  * Handle for controlling an unindexing operation.
  */
-struct GNUNET_FS_UnindexContext
-{
-
+struct GNUNET_FS_UnindexContext {
   /**
    * The content hash key of the last block we processed, will in the
    * end be set to the CHK from the URI.  Used to remove the KBlocks.
@@ -1482,16 +1445,13 @@ struct GNUNET_FS_UnindexContext
    * Current operatinonal phase.
    */
   enum UnindexState state;
-
 };
 
 
 /**
  * Information we keep for each keyword in a keyword search.
  */
-struct SearchRequestEntry
-{
-
+struct SearchRequestEntry {
   /**
    * Hash of the public key, also known as the query.
    */
@@ -1523,15 +1483,13 @@ struct SearchRequestEntry
    * (started with '+')?
    */
   int mandatory;
-
 };
 
 
 /**
  * Handle for controlling a search.
  */
-struct GNUNET_FS_SearchContext
-{
+struct GNUNET_FS_SearchContext {
   /**
    * Handle to the global FS context.
    */
@@ -1627,8 +1585,7 @@ struct GNUNET_FS_SearchContext
  * order of progression is linear through the states, alternatives
  * are documented in the comments.
  */
-enum BlockRequestState
-{
+enum BlockRequestState {
   /**
    * Initial state, block has only been allocated (since it is
    * relevant to the overall download request).
@@ -1695,9 +1652,7 @@ enum BlockRequestState
 /**
  * Information about an active download request.
  */
-struct DownloadRequest
-{
-
+struct DownloadRequest {
   /**
    * Parent in the CHK-tree.
    */
@@ -1740,7 +1695,6 @@ struct DownloadRequest
    * State in the FSM.
    */
   enum BlockRequestState state;
-
 };
 
 
@@ -1750,7 +1704,7 @@ struct DownloadRequest
  * @param dr request to free
  */
 void
-GNUNET_FS_free_download_request_ (struct DownloadRequest *dr);
+GNUNET_FS_free_download_request_(struct DownloadRequest *dr);
 
 
 /**
@@ -1759,15 +1713,13 @@ GNUNET_FS_free_download_request_ (struct DownloadRequest *dr);
  * @param sr result to start pinging for.
  */
 void
-GNUNET_FS_stop_probe_ping_task_ (struct GNUNET_FS_SearchResult *sr);
+GNUNET_FS_stop_probe_ping_task_(struct GNUNET_FS_SearchResult *sr);
 
 
 /**
  * Context for controlling a download.
  */
-struct GNUNET_FS_DownloadContext
-{
-
+struct GNUNET_FS_DownloadContext {
   /**
    * Global FS context.
    */
@@ -1959,7 +1911,6 @@ struct GNUNET_FS_DownloadContext
    * Are we ready to issue requests (reconstructions are finished)?
    */
   int issue_requests;
-
 };