global reindent, now with uncrustify hook enabled

1 files changed, 106 insertions, 103 deletions

diff --git a/src/fs/test_gnunet_service_fs_migration.c b/src/fs/test_gnunet_service_fs_migration.c
index c56e89e11..9842f8a83 100644
--- a/src/fs/test_gnunet_service_fs_migration.c
+++ b/src/fs/test_gnunet_service_fs_migration.c
@@ -37,12 +37,13 @@
 /**
  * How long until we give up on transmitting the message?
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 120)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120)
 
 /**
  * How long do we give the peers for content migration?
  */
-#define MIGRATION_DELAY GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 90)
+#define MIGRATION_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, \
+                                                       90)
 
 #define SEED 42
 
@@ -55,7 +56,8 @@ static struct GNUNET_TIME_Absolute start_time;
 static struct GNUNET_TESTBED_Operation *op;
 
 
-struct DownloadContext {
+struct DownloadContext
+{
   char *fn;
 
   struct GNUNET_FS_Uri *uri;
@@ -63,154 +65,155 @@ struct DownloadContext {
 
 
 static void
-do_stop(void *cls)
+do_stop (void *cls)
 {
   struct GNUNET_TIME_Relative del;
   char *fancy;
 
-  GNUNET_SCHEDULER_shutdown();
+  GNUNET_SCHEDULER_shutdown ();
   if (0 ==
-      GNUNET_TIME_absolute_get_remaining(GNUNET_TIME_absolute_add(start_time,
-                                                                  TIMEOUT)).rel_value_us)
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-                 "Timeout during download, shutting down with error\n");
-      ok = 1;
-    }
+      GNUNET_TIME_absolute_get_remaining (GNUNET_TIME_absolute_add (start_time,
+                                                                    TIMEOUT)).
+      rel_value_us)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Timeout during download, shutting down with error\n");
+    ok = 1;
+  }
   else
-    {
-      del = GNUNET_TIME_absolute_get_duration(start_time);
-      if (del.rel_value_us == 0)
-        del.rel_value_us = 1;
-      fancy =
-        GNUNET_STRINGS_byte_size_fancy(((unsigned long long)FILESIZE) *
-                                       1000000LL / del.rel_value_us);
-      fprintf(stdout,
-              "Download speed was %s/s\n",
-              fancy);
-      GNUNET_free(fancy);
-      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-                 "Finished download, shutting down\n");
-    }
+  {
+    del = GNUNET_TIME_absolute_get_duration (start_time);
+    if (del.rel_value_us == 0)
+      del.rel_value_us = 1;
+    fancy =
+      GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE)
+                                      * 1000000LL / del.rel_value_us);
+    fprintf (stdout,
+             "Download speed was %s/s\n",
+             fancy);
+    GNUNET_free (fancy);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Finished download, shutting down\n");
+  }
 }
 
 
 static void
-do_download(void *cls,
-            const char *emsg)
+do_download (void *cls,
+             const char *emsg)
 {
   struct DownloadContext *dc = cls;
   struct GNUNET_FS_Uri *uri = dc->uri;
 
-  GNUNET_TESTBED_operation_done(op);
+  GNUNET_TESTBED_operation_done (op);
   op = NULL;
   if (NULL != dc->fn)
-    {
-      GNUNET_DISK_directory_remove(dc->fn);
-      GNUNET_free(dc->fn);
-    }
-  GNUNET_free(dc);
+  {
+    GNUNET_DISK_directory_remove (dc->fn);
+    GNUNET_free (dc->fn);
+  }
+  GNUNET_free (dc);
   if (NULL != emsg)
-    {
-      GNUNET_SCHEDULER_shutdown();
-      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-                 "Failed to stop source daemon: %s\n",
-                 emsg);
-      GNUNET_FS_uri_destroy(uri);
-      ok = 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(daemons[0],
-                          TIMEOUT,
-                          1,
-                          SEED,
-                          uri,
-                          VERBOSE,
-                          &do_stop,
-                          NULL);
-  GNUNET_FS_uri_destroy(uri);
+  {
+    GNUNET_SCHEDULER_shutdown ();
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Failed to stop source daemon: %s\n",
+                emsg);
+    GNUNET_FS_uri_destroy (uri);
+    ok = 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 (daemons[0],
+                           TIMEOUT,
+                           1,
+                           SEED,
+                           uri,
+                           VERBOSE,
+                           &do_stop,
+                           NULL);
+  GNUNET_FS_uri_destroy (uri);
 }
 
 
 static void
-stop_source_peer(void *cls)
+stop_source_peer (void *cls)
 {
   struct DownloadContext *dc = cls;
 
   /* FIXME: We should not interact with testbed when shutting down */
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Stopping source peer\n");
-  op = GNUNET_TESTBED_peer_stop(NULL,
-                                daemons[1],
-                                &do_download, dc);
-  GNUNET_assert(NULL != op);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Stopping source peer\n");
+  op = GNUNET_TESTBED_peer_stop (NULL,
+                                 daemons[1],
+                                 &do_download, dc);
+  GNUNET_assert (NULL != op);
 }
 
 
 static void
-do_wait(void *cls,
-        const struct GNUNET_FS_Uri *uri,
-        const char *fn)
+do_wait (void *cls,
+         const struct GNUNET_FS_Uri *uri,
+         const char *fn)
 {
   struct DownloadContext *dc;
 
   if (NULL == uri)
-    {
-      GNUNET_SCHEDULER_shutdown();
-      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-                 "Timeout during upload attempt, shutting down with error\n");
-      ok = 1;
-      return;
-    }
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Waiting to allow content to migrate\n");
-  dc = GNUNET_new(struct DownloadContext);
-  dc->uri = GNUNET_FS_uri_dup(uri);
+  {
+    GNUNET_SCHEDULER_shutdown ();
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Timeout during upload attempt, shutting down with error\n");
+    ok = 1;
+    return;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Waiting to allow content to migrate\n");
+  dc = GNUNET_new (struct DownloadContext);
+  dc->uri = GNUNET_FS_uri_dup (uri);
   if (NULL != fn)
-    dc->fn = GNUNET_strdup(fn);
-  (void)GNUNET_SCHEDULER_add_delayed(MIGRATION_DELAY,
-                                     &stop_source_peer,
-                                     dc);
+    dc->fn = GNUNET_strdup (fn);
+  (void) GNUNET_SCHEDULER_add_delayed (MIGRATION_DELAY,
+                                       &stop_source_peer,
+                                       dc);
 }
 
 
 static void
-do_publish(void *cls,
-           struct GNUNET_TESTBED_RunHandle *h,
-           unsigned int num_peers,
-           struct GNUNET_TESTBED_Peer **peers,
-           unsigned int links_succeeded,
-           unsigned int links_failed)
+do_publish (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(2 == num_peers);
+  GNUNET_assert (2 == num_peers);
   for (i = 0; i < num_peers; i++)
     daemons[i] = peers[i];
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Publishing %llu bytes\n",
-             (unsigned long long)FILESIZE);
-  GNUNET_FS_TEST_publish(daemons[1], TIMEOUT, 1, GNUNET_NO,
-                         FILESIZE, SEED,
-                         VERBOSE, &do_wait, NULL);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Publishing %llu bytes\n",
+              (unsigned long long) FILESIZE);
+  GNUNET_FS_TEST_publish (daemons[1], TIMEOUT, 1, GNUNET_NO,
+                          FILESIZE, SEED,
+                          VERBOSE, &do_wait, NULL);
 }
 
 
 int
-main(int argc,
-     char *argv[])
+main (int argc,
+      char *argv[])
 {
-  (void)GNUNET_TESTBED_test_run("test-gnunet-service-fs-migration",
-                                "fs_test_lib_data.conf",
-                                2,
-                                0, NULL, NULL,
-                                &do_publish,
-                                NULL);
-  GNUNET_DISK_directory_remove("/tmp/test-gnunet-service-fs-migration/");
+  (void) GNUNET_TESTBED_test_run ("test-gnunet-service-fs-migration",
+                                  "fs_test_lib_data.conf",
+                                  2,
+                                  0, NULL, NULL,
+                                  &do_publish,
+                                  NULL);
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-service-fs-migration/");
   return ok;
 }