fixing block reconstruction start/shutdown code

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

diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c
index efe44af0b550aa2b8c8b8b52ef7073ebd33f4b8b..0d37affa2cab0e96ac8be881b45df09791d7fbf9 100644 (file)
--- a/src/fs/test_fs_namespace.c
+++ b/src/fs/test_fs_namespace.c
@@ -35,8 +35,6 @@
 
 #define START_ARM GNUNET_YES
 
-static struct GNUNET_SCHEDULER_Handle *sched;
-
 static struct PeerContext p1;
 
 static GNUNET_HashCode nsid;
@@ -59,7 +57,7 @@ struct PeerContext
 {
   struct GNUNET_CONFIGURATION_Handle *cfg;
 #if START_ARM
-  GNUNET_OS_Process *arm_proc;
+  struct GNUNET_OS_Process *arm_proc;
 #endif
 };
 
@@ -151,8 +149,7 @@ progress_cb (void *cls,
              err = 1;
            }
          /* give system 1ms to initiate update search! */
-         GNUNET_SCHEDULER_add_delayed (sched,
-                                       GNUNET_TIME_UNIT_MILLISECONDS,
+         GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MILLISECONDS,
                                        &abort_sks_search_task,
                                        NULL);
        }
@@ -165,8 +162,7 @@ progress_cb (void *cls,
                       "Wrong result for ksk search!\n");
              err = 1;
            }
-         GNUNET_SCHEDULER_add_continuation (sched,
-                                            &abort_ksk_search_task,
+         GNUNET_SCHEDULER_add_continuation (&abort_ksk_search_task,
                                             NULL,
                                             GNUNET_SCHEDULER_REASON_PREREQ_DONE);
        }
@@ -182,13 +178,11 @@ progress_cb (void *cls,
               "Error searching file: %s\n",
               event->value.search.specifics.error.message);
       if (sks_search == event->value.search.sc)
-       GNUNET_SCHEDULER_add_continuation (sched,
-                                          &abort_sks_search_task,
+       GNUNET_SCHEDULER_add_continuation (&abort_sks_search_task,
                                           NULL,
                                           GNUNET_SCHEDULER_REASON_PREREQ_DONE);
       else if (ksk_search == event->value.search.sc)
-       GNUNET_SCHEDULER_add_continuation (sched,
-                                          &abort_ksk_search_task,
+       GNUNET_SCHEDULER_add_continuation (&abort_ksk_search_task,
                                           NULL,
                                           GNUNET_SCHEDULER_REASON_PREREQ_DONE);
       else
@@ -384,15 +378,12 @@ testNamespace ()
 
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *s,
      char *const *args,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  sched = s;
   setup_peer (&p1, "test_fs_namespace_data.conf");
-  fs = GNUNET_FS_start (sched,
-                       cfg,
+  fs = GNUNET_FS_start (cfg,
                        "test-fs-namespace",
                        &progress_cb,
                        NULL,