diff options
Diffstat (limited to 'src/fs/test_fs_namespace.c')
-rw-r--r-- | src/fs/test_fs_namespace.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c index b1221eb82..df9a310b9 100644 --- a/src/fs/test_fs_namespace.c +++ b/src/fs/test_fs_namespace.c | |||
@@ -139,7 +139,7 @@ abort_sks_search_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
139 | static void | 139 | static void |
140 | do_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 140 | do_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
141 | { | 141 | { |
142 | fprintf (stderr, "Operation timed out\n"); | 142 | FPRINTF (stderr, "%s", "Operation timed out\n"); |
143 | kill_task = GNUNET_SCHEDULER_NO_TASK; | 143 | kill_task = GNUNET_SCHEDULER_NO_TASK; |
144 | abort_sks_search_task (NULL, tc); | 144 | abort_sks_search_task (NULL, tc); |
145 | abort_ksk_search_task (NULL, tc); | 145 | abort_ksk_search_task (NULL, tc); |
@@ -158,7 +158,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event) | |||
158 | if (!GNUNET_FS_uri_test_equal | 158 | if (!GNUNET_FS_uri_test_equal |
159 | (sks_expect_uri, event->value.search.specifics.result.uri)) | 159 | (sks_expect_uri, event->value.search.specifics.result.uri)) |
160 | { | 160 | { |
161 | fprintf (stderr, "Wrong result for sks search!\n"); | 161 | FPRINTF (stderr, "%s", "Wrong result for sks search!\n"); |
162 | err = 1; | 162 | err = 1; |
163 | } | 163 | } |
164 | /* give system 1ms to initiate update search! */ | 164 | /* give system 1ms to initiate update search! */ |
@@ -170,7 +170,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event) | |||
170 | if (!GNUNET_FS_uri_test_equal | 170 | if (!GNUNET_FS_uri_test_equal |
171 | (ksk_expect_uri, event->value.search.specifics.result.uri)) | 171 | (ksk_expect_uri, event->value.search.specifics.result.uri)) |
172 | { | 172 | { |
173 | fprintf (stderr, "Wrong result for ksk search!\n"); | 173 | FPRINTF (stderr, "%s", "Wrong result for ksk search!\n"); |
174 | err = 1; | 174 | err = 1; |
175 | } | 175 | } |
176 | GNUNET_SCHEDULER_add_continuation (&abort_ksk_search_task, NULL, | 176 | GNUNET_SCHEDULER_add_continuation (&abort_ksk_search_task, NULL, |
@@ -178,12 +178,12 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event) | |||
178 | } | 178 | } |
179 | else | 179 | else |
180 | { | 180 | { |
181 | fprintf (stderr, "Unexpected search result received!\n"); | 181 | FPRINTF (stderr, "%s", "Unexpected search result received!\n"); |
182 | GNUNET_break (0); | 182 | GNUNET_break (0); |
183 | } | 183 | } |
184 | break; | 184 | break; |
185 | case GNUNET_FS_STATUS_SEARCH_ERROR: | 185 | case GNUNET_FS_STATUS_SEARCH_ERROR: |
186 | fprintf (stderr, "Error searching file: %s\n", | 186 | FPRINTF (stderr, "Error searching file: %s\n", |
187 | event->value.search.specifics.error.message); | 187 | event->value.search.specifics.error.message); |
188 | if (sks_search == event->value.search.sc) | 188 | if (sks_search == event->value.search.sc) |
189 | GNUNET_SCHEDULER_add_continuation (&abort_sks_search_task, NULL, | 189 | GNUNET_SCHEDULER_add_continuation (&abort_sks_search_task, NULL, |
@@ -210,7 +210,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event) | |||
210 | case GNUNET_FS_STATUS_SEARCH_STOPPED: | 210 | case GNUNET_FS_STATUS_SEARCH_STOPPED: |
211 | return NULL; | 211 | return NULL; |
212 | default: | 212 | default: |
213 | fprintf (stderr, "Unexpected event: %d\n", event->status); | 213 | FPRINTF (stderr, "Unexpected event: %d\n", event->status); |
214 | break; | 214 | break; |
215 | } | 215 | } |
216 | return event->value.search.cctx; | 216 | return event->value.search.cctx; |
@@ -227,7 +227,7 @@ publish_cont (void *cls, const struct GNUNET_FS_Uri *ksk_uri, const char *emsg) | |||
227 | 227 | ||
228 | if (NULL != emsg) | 228 | if (NULL != emsg) |
229 | { | 229 | { |
230 | fprintf (stderr, "Error publishing: %s\n", emsg); | 230 | FPRINTF (stderr, "Error publishing: %s\n", emsg); |
231 | err = 1; | 231 | err = 1; |
232 | GNUNET_FS_stop (fs); | 232 | GNUNET_FS_stop (fs); |
233 | return; | 233 | return; |
@@ -237,7 +237,7 @@ publish_cont (void *cls, const struct GNUNET_FS_Uri *ksk_uri, const char *emsg) | |||
237 | sks_uri = GNUNET_FS_uri_parse (sbuf, &msg); | 237 | sks_uri = GNUNET_FS_uri_parse (sbuf, &msg); |
238 | if (msg != NULL) | 238 | if (msg != NULL) |
239 | { | 239 | { |
240 | fprintf (stderr, "failed to parse URI `%s': %s\n", sbuf, msg); | 240 | FPRINTF (stderr, "failed to parse URI `%s': %s\n", sbuf, msg); |
241 | err = 1; | 241 | err = 1; |
242 | GNUNET_FS_stop (fs); | 242 | GNUNET_FS_stop (fs); |
243 | GNUNET_free (msg); | 243 | GNUNET_free (msg); |
@@ -287,7 +287,7 @@ adv_cont (void *cls, const struct GNUNET_FS_Uri *uri, const char *emsg) | |||
287 | 287 | ||
288 | if (NULL != emsg) | 288 | if (NULL != emsg) |
289 | { | 289 | { |
290 | fprintf (stderr, "Error publishing: %s\n", emsg); | 290 | FPRINTF (stderr, "Error publishing: %s\n", emsg); |
291 | err = 1; | 291 | err = 1; |
292 | GNUNET_FS_stop (fs); | 292 | GNUNET_FS_stop (fs); |
293 | return; | 293 | return; |
@@ -336,7 +336,7 @@ testNamespace () | |||
336 | GNUNET_FS_namespace_list (fs, &ns_iterator, &ok); | 336 | GNUNET_FS_namespace_list (fs, &ns_iterator, &ok); |
337 | if (GNUNET_NO == ok) | 337 | if (GNUNET_NO == ok) |
338 | { | 338 | { |
339 | fprintf (stderr, "namespace_list failed to find namespace!\n"); | 339 | FPRINTF (stderr, "%s", "namespace_list failed to find namespace!\n"); |
340 | GNUNET_FS_namespace_delete (ns, GNUNET_YES); | 340 | GNUNET_FS_namespace_delete (ns, GNUNET_YES); |
341 | GNUNET_FS_stop (fs); | 341 | GNUNET_FS_stop (fs); |
342 | err = 1; | 342 | err = 1; |
@@ -399,7 +399,7 @@ main (int argc, char *argv[]) | |||
399 | stop_arm (&p1); | 399 | stop_arm (&p1); |
400 | if (GNUNET_YES != update_started) | 400 | if (GNUNET_YES != update_started) |
401 | { | 401 | { |
402 | fprintf (stderr, "Update search never started!\n"); | 402 | FPRINTF (stderr, "%s", "Update search never started!\n"); |
403 | err = 1; | 403 | err = 1; |
404 | } | 404 | } |
405 | GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-namespace/"); | 405 | GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-namespace/"); |