big scheduler refactoring, expect some issues

1 files changed, 3 insertions, 10 deletions

diff --git a/src/fs/test_fs_publish.c b/src/fs/test_fs_publish.c
index b5472ca93..327fa5a69 100644
--- a/src/fs/test_fs_publish.c
+++ b/src/fs/test_fs_publish.c
@@ -61,8 +61,6 @@ static struct PeerContext p1;
 
 static struct GNUNET_TIME_Absolute start;
 
-static struct GNUNET_SCHEDULER_Handle *sched;
-
 static struct GNUNET_FS_Handle *fs;
 
 static struct GNUNET_FS_PublishContext *publish;
@@ -103,8 +101,7 @@ progress_cb (void *cls,
               (unsigned long long) (FILESIZE * 1000 / (1+GNUNET_TIME_absolute_get_duration (start).rel_value) / 1024));
       if (0 == strcmp ("publish-context-dir", 
                        event->value.publish.cctx))      
-        GNUNET_SCHEDULER_add_continuation (sched,
-                                           &abort_publish_task,
+        GNUNET_SCHEDULER_add_continuation (&abort_publish_task,
                                            NULL,
                                            GNUNET_SCHEDULER_REASON_PREREQ_DONE);        
       break;
@@ -130,8 +127,7 @@ progress_cb (void *cls,
         {
           fprintf (stderr, "Scheduling abort task for error on `%s'\n",
                    (const char*) event->value.publish.cctx);
-          GNUNET_SCHEDULER_add_continuation (sched,
-                                             &abort_publish_task,
+          GNUNET_SCHEDULER_add_continuation (&abort_publish_task,
                                              NULL,
                                              GNUNET_SCHEDULER_REASON_PREREQ_DONE);
         }
@@ -214,7 +210,6 @@ stop_arm (struct PeerContext *p)
 
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *s,
      char *const *args,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
@@ -231,10 +226,8 @@ run (void *cls,
   struct GNUNET_FS_FileInformation *fidir;
   size_t i;
 
-  sched = s;
   setup_peer (&p1, "test_fs_publish_data.conf");
-  fs = GNUNET_FS_start (sched,
-                        cfg,
+  fs = GNUNET_FS_start (cfg,
                         "test-fs-publish",
                         &progress_cb,
                         NULL,