-help seaspider some more

[oweals/gnunet.git] / src / fs / test_fs_download_recursive.c

diff --git a/src/fs/test_fs_download_recursive.c b/src/fs/test_fs_download_recursive.c
index c3e0ea440eac134ee633875f614e9ac9d2714741..bcbfe2b2a9b6e9917fc6bf130578ce39eae09994 100644 (file)
--- a/src/fs/test_fs_download_recursive.c
+++ b/src/fs/test_fs_download_recursive.c
@@ -50,9 +50,9 @@ makeName (unsigned int i)
                       ("/tmp/gnunet-fsui-recursive_download_test/FSUITEST") +
                       15);
   GNUNET_snprintf (fn,
-                   strlen
-                   ("/tmp/gnunet-fsui-recursive_download_test/FSUITEST") + 15,
-                   "/tmp/gnunet-fsui-recursive_download_test/FSUITEST%u/", i);
+                   strlen ("/tmp/gnunet-fsui-recursive_download_test/FSUITEST")
+                   + 15, "/tmp/gnunet-fsui-recursive_download_test/FSUITEST%u/",
+                   i);
   return fn;
 }
 
@@ -142,8 +142,9 @@ checkHierarchy (unsigned int i, const char *tree)
     GNUNET_free (fn);
     return GNUNET_SYSERR;
   }
-  res = ((makeHierarchyHelper (fn, tree, 0, 1) == -1) ?
-         GNUNET_SYSERR : GNUNET_OK);
+  res =
+      ((makeHierarchyHelper (fn, tree, 0, 1) ==
+        -1) ? GNUNET_SYSERR : GNUNET_OK);
   GNUNET_free (fn);
   return res;
 }
@@ -212,14 +213,14 @@ eventCallback (void *cls, const GNUNET_FSUI_Event * event)
 #endif
     break;
   case GNUNET_FSUI_unindex_error:
-    fprintf (stderr, "Error unindexing: %s\n",
+    FPRINTF (stderr, "Error unindexing: %s\n",
              event->data.UnindexError.message);
     break;
   case GNUNET_FSUI_upload_error:
-    fprintf (stderr, "Error uploading: %s\n", event->data.UploadError.message);
+    FPRINTF (stderr, "Error uploading: %s\n", event->data.UploadError.message);
     break;
   case GNUNET_FSUI_download_error:
-    fprintf (stderr, "Error downloading: %s\n",
+    FPRINTF (stderr, "Error downloading: %s\n",
              event->data.DownloadError.message);
     break;
   case GNUNET_FSUI_download_aborted:
@@ -276,7 +277,7 @@ main (int argc, char *argv[])
     GNUNET_GC_free (cfg);
     return -1;
   }
-  fprintf (stderr, "Setup...\n");
+  FPRINTF (stderr, "%s",  "Setup...\n");
 #if START_DAEMON
   GNUNET_disk_directory_remove (NULL,
                                 "/tmp/gnunet-fsui-recursive_download_test/");
@@ -287,24 +288,24 @@ main (int argc, char *argv[])
   GNUNET_thread_sleep (5 * GNUNET_CRON_SECONDS);        /* give apps time to start */
   /* ACTUAL TEST CODE */
 #endif
-  ctx = GNUNET_FSUI_start (NULL,
-                           cfg, "fsuirecursive_download_test", 32, GNUNET_YES,
-                           &eventCallback, NULL);
+  ctx =
+      GNUNET_FSUI_start (NULL, cfg, "fsuirecursive_download_test", 32,
+                         GNUNET_YES, &eventCallback, NULL);
   CHECK (ctx != NULL);
   fn = makeHierarchy (42, DIRECTORY_TREE_SPEC);
   meta = GNUNET_meta_data_create ();
   kuri =
       GNUNET_ECRS_keyword_command_line_to_uri (ectx, 2,
                                                (const char **) keywords);
-  fprintf (stderr, "Uploading...\n");
+  FPRINTF (stderr, "%s",  "Uploading...\n");
   waitForEvent = GNUNET_FSUI_upload_completed;
-  upload = GNUNET_FSUI_upload_start (ctx,
-                                     fn,
-                                     (GNUNET_FSUI_DirectoryScanCallback) &
-                                     GNUNET_disk_directory_scan, NULL, 0, 0,
-                                     GNUNET_YES, GNUNET_NO, GNUNET_NO,
-                                     GNUNET_get_time () +
-                                     5 * GNUNET_CRON_HOURS, meta, kuri, kuri);
+  upload =
+      GNUNET_FSUI_upload_start (ctx, fn,
+                                (GNUNET_FSUI_DirectoryScanCallback) &
+                                GNUNET_disk_directory_scan, NULL, 0, 0,
+                                GNUNET_YES, GNUNET_NO, GNUNET_NO,
+                                GNUNET_get_time () + 5 * GNUNET_CRON_HOURS,
+                                meta, kuri, kuri);
   CHECK (upload != NULL);
   GNUNET_ECRS_uri_destroy (kuri);
   kuri = NULL;
@@ -321,13 +322,12 @@ main (int argc, char *argv[])
   upload = NULL;
   CHECK (upURI != NULL);
 
-  fprintf (stderr, "Downloading...\n");
+  FPRINTF (stderr, "%s",  "Downloading...\n");
   waitForEvent = GNUNET_FSUI_download_completed;
   fn43 = makeName (43);
-  download = GNUNET_FSUI_download_start (ctx,
-                                         0,
-                                         GNUNET_YES,
-                                         upURI, meta, fn43, NULL, NULL);
+  download =
+      GNUNET_FSUI_download_start (ctx, 0, GNUNET_YES, upURI, meta, fn43, NULL,
+                                  NULL);
   CHECK (download != NULL);
   GNUNET_free (fn43);
   fn43 = NULL;
@@ -341,7 +341,7 @@ main (int argc, char *argv[])
       break;
   }
 FAILURE:
-  fprintf (stderr, "Cleanup...\n");
+  FPRINTF (stderr, "%s",  "Cleanup...\n");
   if (meta != NULL)
     GNUNET_meta_data_destroy (meta);
   if (ctx != NULL)
@@ -365,7 +365,7 @@ FAILURE:
 
 #if START_DAEMON
   GNUNET_GE_BREAK (NULL, GNUNET_OK == GNUNET_daemon_stop (NULL, daemon));
-  GNUNET_OS_process_close (daemon);
+  GNUNET_OS_process_destroy (daemon);
   daemon = NULL;
 #endif
   GNUNET_GC_free (cfg);