diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-08-03 09:35:48 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-08-03 09:35:48 +0000 |
commit | d3e7a5e40dd2d5409009a30e1e41148c4d852673 (patch) | |
tree | 21ff19580a99137e9b8aec4393feb67f0f1c7b5a /src/fs/test_fs_search.c | |
parent | ec69ceabc67a72373a2579d871c5fe85676a73bd (diff) | |
download | gnunet-d3e7a5e40dd2d5409009a30e1e41148c4d852673.tar.gz gnunet-d3e7a5e40dd2d5409009a30e1e41148c4d852673.zip |
-use simpler, modern scheduler API
Diffstat (limited to 'src/fs/test_fs_search.c')
-rw-r--r-- | src/fs/test_fs_search.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/fs/test_fs_search.c b/src/fs/test_fs_search.c index a3f498f77..c24d062dd 100644 --- a/src/fs/test_fs_search.c +++ b/src/fs/test_fs_search.c | |||
@@ -137,21 +137,18 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event) | |||
137 | case GNUNET_FS_STATUS_SEARCH_RESULT: | 137 | case GNUNET_FS_STATUS_SEARCH_RESULT: |
138 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 138 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
139 | "Search complete.\n"); | 139 | "Search complete.\n"); |
140 | GNUNET_SCHEDULER_add_continuation (&abort_search_task, NULL, | 140 | GNUNET_SCHEDULER_add_now (&abort_search_task, NULL); |
141 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); | ||
142 | break; | 141 | break; |
143 | case GNUNET_FS_STATUS_PUBLISH_ERROR: | 142 | case GNUNET_FS_STATUS_PUBLISH_ERROR: |
144 | FPRINTF (stderr, "Error publishing file: %s\n", | 143 | FPRINTF (stderr, "Error publishing file: %s\n", |
145 | event->value.publish.specifics.error.message); | 144 | event->value.publish.specifics.error.message); |
146 | GNUNET_break (0); | 145 | GNUNET_break (0); |
147 | GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL, | 146 | GNUNET_SCHEDULER_add_now (&abort_publish_task, NULL); |
148 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); | ||
149 | break; | 147 | break; |
150 | case GNUNET_FS_STATUS_SEARCH_ERROR: | 148 | case GNUNET_FS_STATUS_SEARCH_ERROR: |
151 | FPRINTF (stderr, "Error searching file: %s\n", | 149 | FPRINTF (stderr, "Error searching file: %s\n", |
152 | event->value.search.specifics.error.message); | 150 | event->value.search.specifics.error.message); |
153 | GNUNET_SCHEDULER_add_continuation (&abort_search_task, NULL, | 151 | GNUNET_SCHEDULER_add_now (&abort_search_task, NULL); |
154 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); | ||
155 | break; | 152 | break; |
156 | case GNUNET_FS_STATUS_PUBLISH_START: | 153 | case GNUNET_FS_STATUS_PUBLISH_START: |
157 | GNUNET_assert (0 == strcmp ("publish-context", event->value.publish.cctx)); | 154 | GNUNET_assert (0 == strcmp ("publish-context", event->value.publish.cctx)); |
@@ -176,8 +173,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event) | |||
176 | break; | 173 | break; |
177 | case GNUNET_FS_STATUS_SEARCH_STOPPED: | 174 | case GNUNET_FS_STATUS_SEARCH_STOPPED: |
178 | GNUNET_assert (search == event->value.search.sc); | 175 | GNUNET_assert (search == event->value.search.sc); |
179 | GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL, | 176 | GNUNET_SCHEDULER_add_now (&abort_publish_task, NULL); |
180 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); | ||
181 | break; | 177 | break; |
182 | default: | 178 | default: |
183 | FPRINTF (stderr, "Unexpected event: %d\n", event->status); | 179 | FPRINTF (stderr, "Unexpected event: %d\n", event->status); |