indentation

1 files changed, 41 insertions, 67 deletions

diff --git a/src/fs/fs_file_information.c b/src/fs/fs_file_information.c
index bb323bbbc..6809e3055 100644
--- a/src/fs/fs_file_information.c
+++ b/src/fs/fs_file_information.c
@@ -52,18 +52,13 @@
  * @return always 0 to continue extracting
  */
 static int
-add_to_md (void *cls,
-           const char *plugin_name,
-           enum EXTRACTOR_MetaType type,
-           enum EXTRACTOR_MetaFormat format,
-           const char *data_mime_type, const char *data, size_t data_len)
+add_to_md (void *cls, const char *plugin_name, enum EXTRACTOR_MetaType type,
+           enum EXTRACTOR_MetaFormat format, const char *data_mime_type,
+           const char *data, size_t data_len)
 {
   struct GNUNET_CONTAINER_MetaData *md = cls;
 
-  (void) GNUNET_CONTAINER_meta_data_insert (md,
-                                            plugin_name,
-                                            type,
-                                            format,
+  (void) GNUNET_CONTAINER_meta_data_insert (md, plugin_name, type, format,
                                             data_mime_type, data, data_len);
   return 0;
 }
@@ -76,8 +71,8 @@ add_to_md (void *cls,
  *   of meta-data items obtained
  */
 int
-GNUNET_FS_meta_data_extract_from_file (struct GNUNET_CONTAINER_MetaData
-                                       *md, const char *filename,
+GNUNET_FS_meta_data_extract_from_file (struct GNUNET_CONTAINER_MetaData *md,
+                                       const char *filename,
                                        struct EXTRACTOR_PluginList *extractors)
 {
   int old;
@@ -160,13 +155,12 @@ GNUNET_FS_file_information_create_from_file (struct GNUNET_FS_Handle *h,
     GNUNET_break (0);
     return NULL;
   }
-  ret = GNUNET_FS_file_information_create_from_reader (h,
-                                                       client_info,
-                                                       sbuf.st_size,
-                                                       &GNUNET_FS_data_reader_file_,
-                                                       fi,
-                                                       keywords,
-                                                       meta, do_index, bo);
+  ret =
+      GNUNET_FS_file_information_create_from_reader (h, client_info,
+                                                     sbuf.st_size,
+                                                     &GNUNET_FS_data_reader_file_,
+                                                     fi, keywords, meta,
+                                                     do_index, bo);
   if (ret == NULL)
     return NULL;
   ret->h = h;
@@ -179,8 +173,7 @@ GNUNET_FS_file_information_create_from_file (struct GNUNET_FS_Handle *h,
 #endif
   while (NULL != (ss = strstr (fn, DIR_SEPARATOR_STR)))
     fn = ss + 1;
-  GNUNET_CONTAINER_meta_data_insert (ret->meta,
-                                     "<gnunet>",
+  GNUNET_CONTAINER_meta_data_insert (ret->meta, "<gnunet>",
                                      EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
                                      EXTRACTOR_METAFORMAT_C_STRING,
                                      "text/plain", fn, strlen (fn) + 1);
@@ -206,8 +199,7 @@ GNUNET_FS_file_information_create_from_file (struct GNUNET_FS_Handle *h,
  */
 struct GNUNET_FS_FileInformation *
 GNUNET_FS_file_information_create_from_data (struct GNUNET_FS_Handle *h,
-                                             void *client_info,
-                                             uint64_t length,
+                                             void *client_info, uint64_t length,
                                              void *data,
                                              const struct GNUNET_FS_Uri
                                              *keywords,
@@ -222,13 +214,10 @@ GNUNET_FS_file_information_create_from_data (struct GNUNET_FS_Handle *h,
     GNUNET_break (0);
     return NULL;
   }
-  return GNUNET_FS_file_information_create_from_reader (h,
-                                                        client_info,
-                                                        length,
+  return GNUNET_FS_file_information_create_from_reader (h, client_info, length,
                                                         &GNUNET_FS_data_reader_copy_,
-                                                        data,
-                                                        keywords,
-                                                        meta, do_index, bo);
+                                                        data, keywords, meta,
+                                                        do_index, bo);
 }
 
 
@@ -357,15 +346,13 @@ dir_scan_cb (void *cls, const char *filename)
 
   if (0 != STAT (filename, &sbuf))
   {
-    GNUNET_asprintf (&dsc->emsg,
-                     _("`%s' failed on file `%s': %s"),
-                     "stat", filename, STRERROR (errno));
+    GNUNET_asprintf (&dsc->emsg, _("`%s' failed on file `%s': %s"), "stat",
+                     filename, STRERROR (errno));
     return GNUNET_SYSERR;
   }
   if (S_ISDIR (sbuf.st_mode))
   {
-    fi = GNUNET_FS_file_information_create_from_directory (dsc->h,
-                                                           NULL,
+    fi = GNUNET_FS_file_information_create_from_directory (dsc->h, NULL,
                                                            filename,
                                                            dsc->scanner,
                                                            dsc->scanner_cls,
@@ -383,11 +370,8 @@ dir_scan_cb (void *cls, const char *filename)
     GNUNET_FS_meta_data_extract_from_file (meta, filename, dsc->extractors);
     keywords = GNUNET_FS_uri_ksk_create_from_meta_data (meta);
     ksk_uri = GNUNET_FS_uri_ksk_canonicalize (keywords);
-    fi = GNUNET_FS_file_information_create_from_file (dsc->h,
-                                                      NULL,
-                                                      filename,
-                                                      ksk_uri,
-                                                      meta,
+    fi = GNUNET_FS_file_information_create_from_file (dsc->h, NULL, filename,
+                                                      ksk_uri, meta,
                                                       dsc->do_index, dsc->bo);
     GNUNET_CONTAINER_meta_data_destroy (meta);
     GNUNET_FS_uri_destroy (keywords);
@@ -420,10 +404,8 @@ dir_scan_cb (void *cls, const char *filename)
  * @return GNUNET_OK on success
  */
 int
-GNUNET_FS_directory_scanner_default (void *cls,
-                                     struct GNUNET_FS_Handle *h,
-                                     const char *dirname,
-                                     int do_index,
+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)
@@ -527,9 +509,9 @@ GNUNET_FS_file_information_create_from_directory (struct GNUNET_FS_Handle *h,
   scanner (scanner_cls, h, filename, do_index, bo, &dirproc, &dc, emsg);
   ksk = NULL;                   // FIXME...
   // FIXME: create meta!
-  ret = GNUNET_FS_file_information_create_empty_directory (h,
-                                                           client_info,
-                                                           ksk, meta, bo);
+  ret =
+      GNUNET_FS_file_information_create_empty_directory (h, client_info, ksk,
+                                                         meta, bo);
   GNUNET_CONTAINER_meta_data_destroy (meta);
   ret->data.dir.entries = dc.entries;
   while (dc.entries != NULL)
@@ -541,8 +523,7 @@ GNUNET_FS_file_information_create_from_directory (struct GNUNET_FS_Handle *h,
   while ((NULL != (ss = strstr (fn, DIR_SEPARATOR_STR))) && (strlen (ss) > 1))
     fn = ss + 1;
   GNUNET_asprintf (&dn, "%s/", fn);
-  GNUNET_CONTAINER_meta_data_insert (ret->meta,
-                                     "<gnunet>",
+  GNUNET_CONTAINER_meta_data_insert (ret->meta, "<gnunet>",
                                      EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
                                      EXTRACTOR_METAFORMAT_C_STRING,
                                      "text/plain", dn, strlen (dn) + 1);
@@ -656,10 +637,9 @@ GNUNET_FS_file_information_inspect (struct GNUNET_FS_FileInformation *dir,
 
   no = GNUNET_NO;
   if (GNUNET_OK !=
-      proc (proc_cls,
-            dir,
-            (dir->is_directory) ? dir->data.dir.dir_size : dir->data.
-            file.file_size, dir->meta, &dir->keywords, &dir->bo,
+      proc (proc_cls, dir,
+            (dir->is_directory) ? dir->data.dir.dir_size : dir->data.file.
+            file_size, dir->meta, &dir->keywords, &dir->bo,
             (dir->is_directory) ? &no : &dir->data.file.do_index,
             &dir->client_info))
     return;
@@ -670,10 +650,9 @@ GNUNET_FS_file_information_inspect (struct GNUNET_FS_FileInformation *dir,
   {
     no = GNUNET_NO;
     if (GNUNET_OK !=
-        proc (proc_cls,
-              pos,
-              (pos->is_directory) ? pos->data.dir.dir_size : pos->data.
-              file.file_size, pos->meta, &pos->keywords, &pos->bo,
+        proc (proc_cls, pos,
+              (pos->is_directory) ? pos->data.dir.dir_size : pos->data.file.
+              file_size, pos->meta, &pos->keywords, &pos->bo,
               (dir->is_directory) ? &no : &dir->data.file.do_index,
               &pos->client_info))
       break;
@@ -711,10 +690,8 @@ GNUNET_FS_file_information_destroy (struct GNUNET_FS_FileInformation *fi,
     }
     /* clean up client-info */
     if (NULL != cleaner)
-      cleaner (cleaner_cls,
-               fi,
-               fi->data.dir.dir_size,
-               fi->meta, &fi->keywords, &fi->bo, &no, &fi->client_info);
+      cleaner (cleaner_cls, fi, fi->data.dir.dir_size, fi->meta, &fi->keywords,
+               &fi->bo, &no, &fi->client_info);
     GNUNET_free_non_null (fi->data.dir.dir_data);
   }
   else
@@ -724,20 +701,17 @@ GNUNET_FS_file_information_destroy (struct GNUNET_FS_FileInformation *fi,
       fi->data.file.reader (fi->data.file.reader_cls, 0, 0, NULL, NULL);
     /* clean up client-info */
     if (NULL != cleaner)
-      cleaner (cleaner_cls,
-               fi,
-               fi->data.file.file_size,
-               fi->meta,
-               &fi->keywords,
-               &fi->bo, &fi->data.file.do_index, &fi->client_info);
+      cleaner (cleaner_cls, fi, fi->data.file.file_size, fi->meta,
+               &fi->keywords, &fi->bo, &fi->data.file.do_index,
+               &fi->client_info);
   }
   GNUNET_free_non_null (fi->filename);
   GNUNET_free_non_null (fi->emsg);
   GNUNET_free_non_null (fi->chk_uri);
   /* clean up serialization */
   if ((NULL != fi->serialization) && (0 != UNLINK (fi->serialization)))
-    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
-                              "unlink", fi->serialization);
+    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink",
+                              fi->serialization);
   if (NULL != fi->keywords)
     GNUNET_FS_uri_destroy (fi->keywords);
   if (NULL != fi->meta)