1 files changed, 72 insertions, 71 deletions

diff --git a/src/fs/test_fs_test_lib.c b/src/fs/test_fs_test_lib.c
index 7e27469cc..25b843e85 100644
--- a/src/fs/test_fs_test_lib.c
+++ b/src/fs/test_fs_test_lib.c
@@ -36,7 +36,7 @@
 /**
  * How long until we give up on transmitting the message?
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 300)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
 
 #define NUM_DAEMONS 2
 
@@ -50,74 +50,75 @@ static int ret;
 
 
 static void
-do_stop(void *cls)
+do_stop (void *cls)
 {
   char *fn = cls;
 
   if (0 ==
-      GNUNET_TIME_absolute_get_remaining(GNUNET_TIME_absolute_add(start_time,
-                                                                  TIMEOUT)).rel_value_us)
-    {
-      GNUNET_break(0);
-      ret = 1;
-    }
+      GNUNET_TIME_absolute_get_remaining (GNUNET_TIME_absolute_add (start_time,
+                                                                    TIMEOUT)).
+      rel_value_us)
+  {
+    GNUNET_break (0);
+    ret = 1;
+  }
   else
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-                 "Finished download, shutting down\n");
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Finished download, shutting down\n");
+  }
   if (NULL != fn)
-    {
-      GNUNET_DISK_directory_remove(fn);
-      GNUNET_free(fn);
-    }
-  GNUNET_SCHEDULER_shutdown();
+  {
+    GNUNET_DISK_directory_remove (fn);
+    GNUNET_free (fn);
+  }
+  GNUNET_SCHEDULER_shutdown ();
 }
 
 
 static void
-do_download(void *cls,
-            const struct GNUNET_FS_Uri *uri,
-            const char *fn)
+do_download (void *cls,
+             const struct GNUNET_FS_Uri *uri,
+             const char *fn)
 {
   if (NULL == uri)
-    {
-      GNUNET_break(0);
-      GNUNET_SCHEDULER_shutdown();
-      ret = 1;
-      return;
-    }
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Downloading %llu bytes\n",
-             (unsigned long long)FILESIZE);
-  start_time = GNUNET_TIME_absolute_get();
-  GNUNET_FS_TEST_download(the_peers[0],
-                          TIMEOUT, 1, SEED,
-                          uri,
-                          VERBOSE,
-                          &do_stop,
-                          (NULL == fn) ? NULL : GNUNET_strdup(fn));
+  {
+    GNUNET_break (0);
+    GNUNET_SCHEDULER_shutdown ();
+    ret = 1;
+    return;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Downloading %llu bytes\n",
+              (unsigned long long) FILESIZE);
+  start_time = GNUNET_TIME_absolute_get ();
+  GNUNET_FS_TEST_download (the_peers[0],
+                           TIMEOUT, 1, SEED,
+                           uri,
+                           VERBOSE,
+                           &do_stop,
+                           (NULL == fn) ? NULL : GNUNET_strdup (fn));
 }
 
 
 static void
-do_publish(void *cls,
-           struct GNUNET_TESTBED_Operation *op,
-           const char *emsg)
+do_publish (void *cls,
+            struct GNUNET_TESTBED_Operation *op,
+            const char *emsg)
 {
-  GNUNET_TESTBED_operation_done(op);
+  GNUNET_TESTBED_operation_done (op);
   if (NULL != emsg)
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect peers: %s\n", emsg);
-      GNUNET_break(0);
-      ret = 1;
-      GNUNET_SCHEDULER_shutdown();
-      return;
-    }
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Publishing %llu bytes\n",
-             (unsigned long long)FILESIZE);
-  GNUNET_FS_TEST_publish(the_peers[0], TIMEOUT, 1, GNUNET_NO, FILESIZE, SEED,
-                         VERBOSE, &do_download, NULL);
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to connect peers: %s\n", emsg);
+    GNUNET_break (0);
+    ret = 1;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Publishing %llu bytes\n",
+              (unsigned long long) FILESIZE);
+  GNUNET_FS_TEST_publish (the_peers[0], TIMEOUT, 1, GNUNET_NO, FILESIZE, SEED,
+                          VERBOSE, &do_download, NULL);
 }
 
 
@@ -134,23 +135,23 @@ do_publish(void *cls,
  *          failed
  */
 static void
-run(void *cls,
-    struct GNUNET_TESTBED_RunHandle *h,
-    unsigned int num_peers,
-    struct GNUNET_TESTBED_Peer **peers,
-    unsigned int links_succeeded,
-    unsigned int links_failed)
+run (void *cls,
+     struct GNUNET_TESTBED_RunHandle *h,
+     unsigned int num_peers,
+     struct GNUNET_TESTBED_Peer **peers,
+     unsigned int links_succeeded,
+     unsigned int links_failed)
 {
   unsigned int i;
 
-  GNUNET_assert(NUM_DAEMONS == num_peers);
+  GNUNET_assert (NUM_DAEMONS == num_peers);
   for (i = 0; i < num_peers; i++)
     the_peers[i] = peers[i];
-  GNUNET_TESTBED_overlay_connect(NULL,
-                                 &do_publish,
-                                 NULL,
-                                 peers[0],
-                                 peers[1]);
+  GNUNET_TESTBED_overlay_connect (NULL,
+                                  &do_publish,
+                                  NULL,
+                                  peers[0],
+                                  peers[1]);
 }
 
 
@@ -162,15 +163,15 @@ run(void *cls,
  * @return 0 on success
  */
 int
-main(int argc, char *argv[])
+main (int argc, char *argv[])
 {
-  GNUNET_DISK_directory_remove("/tmp/gnunet-test-fs-lib/");
-  (void)GNUNET_TESTBED_test_run("test_fs_test_lib",
-                                "fs_test_lib_data.conf",
-                                NUM_DAEMONS,
-                                0, NULL, NULL,
-                                &run, NULL);
-  GNUNET_DISK_directory_remove("/tmp/gnunet-test-fs-lib/");
+  GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
+  (void) GNUNET_TESTBED_test_run ("test_fs_test_lib",
+                                  "fs_test_lib_data.conf",
+                                  NUM_DAEMONS,
+                                  0, NULL, NULL,
+                                  &run, NULL);
+  GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
   return ret;
 }