- clean up gns rest api

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

diff --git a/src/fs/test_fs_search_with_and.c b/src/fs/test_fs_search_with_and.c
index de016c2ae6ea94d75ebd6b466c0b3727274e7d4a..6583e6653c0494b7b529fc861028e2180e4ee157 100644 (file)
--- a/src/fs/test_fs_search_with_and.c
+++ b/src/fs/test_fs_search_with_and.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2004-2013 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2004-2013 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -58,7 +58,7 @@ static struct GNUNET_FS_SearchContext *search;
 
 static struct GNUNET_FS_PublishContext *publish;
 
-static GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+static struct GNUNET_SCHEDULER_Task * timeout_task;
 
 static int err;
 
@@ -73,10 +73,10 @@ abort_publish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_FS_publish_stop (publish);
     publish = NULL;
   }
-  if (GNUNET_SCHEDULER_NO_TASK != timeout_task)
+  if (NULL != timeout_task)
   {
     GNUNET_SCHEDULER_cancel (timeout_task);
-    timeout_task = GNUNET_SCHEDULER_NO_TASK;
+    timeout_task = NULL;
   }
 }
 
@@ -86,7 +86,7 @@ abort_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   fprintf (stderr,
           "Timeout\n");
-  timeout_task = GNUNET_SCHEDULER_NO_TASK;
+  timeout_task = NULL;
   if (NULL != search)
   {
     GNUNET_FS_search_stop (search);
@@ -132,9 +132,11 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
   case GNUNET_FS_STATUS_PUBLISH_PROGRESS_DIRECTORY:
     break;
   case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
+       processed_files++;
        if(processed_files == NUM_FILES)
        {
-         kuri = GNUNET_FS_uri_ksk_create ("+down_foo +down_bar", NULL);
+         char *emsg = NULL;
+         kuri = GNUNET_FS_uri_ksk_create ("+down_foo +down_bar", &emsg);
       GNUNET_assert (kuri != NULL);
                
       start = GNUNET_TIME_absolute_get ();
@@ -170,7 +172,6 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
     GNUNET_assert (FILESIZE == event->value.publish.size);
     GNUNET_assert (0 == event->value.publish.completed);
     GNUNET_assert (1 == event->value.publish.anonymity);
-       processed_files++;
     break;
   case GNUNET_FS_STATUS_PUBLISH_STOPPED:
     GNUNET_assert (publish == event->value.publish.pc);