aboutsummaryrefslogtreecommitdiff
path: root/src/fs
diff options
context:
space:
mode:
Diffstat (limited to 'src/fs')
-rw-r--r--src/fs/gnunet-directory.c2
-rw-r--r--src/fs/gnunet-download.c20
-rw-r--r--src/fs/gnunet-fs.c4
-rw-r--r--src/fs/gnunet-pseudonym.c14
-rw-r--r--src/fs/gnunet-publish.c44
-rw-r--r--src/fs/gnunet-search.c12
-rw-r--r--src/fs/gnunet-unindex.c12
-rw-r--r--src/fs/perf_gnunet_service_fs_p2p.c4
-rw-r--r--src/fs/perf_gnunet_service_fs_p2p_trust.c4
-rw-r--r--src/fs/test_fs_directory.c4
-rw-r--r--src/fs/test_fs_download.c4
-rw-r--r--src/fs/test_fs_download_indexed.c4
-rw-r--r--src/fs/test_fs_download_persistence.c4
-rw-r--r--src/fs/test_fs_download_recursive.c14
-rw-r--r--src/fs/test_fs_file_information.c4
-rw-r--r--src/fs/test_fs_getopt.c2
-rw-r--r--src/fs/test_fs_list_indexed.c2
-rw-r--r--src/fs/test_fs_namespace.c22
-rw-r--r--src/fs/test_fs_publish.c4
-rw-r--r--src/fs/test_fs_publish_persistence.c2
-rw-r--r--src/fs/test_fs_search.c6
-rw-r--r--src/fs/test_fs_search_persistence.c6
-rw-r--r--src/fs/test_fs_search_ranking.c2
-rw-r--r--src/fs/test_fs_unindex.c4
-rw-r--r--src/fs/test_fs_unindex_persistence.c4
-rw-r--r--src/fs/test_fs_uri.c6
-rw-r--r--src/fs/test_gnunet_service_fs_migration.c4
-rw-r--r--src/fs/test_gnunet_service_fs_p2p.c2
28 files changed, 108 insertions, 108 deletions
diff --git a/src/fs/gnunet-directory.c b/src/fs/gnunet-directory.c
index f2b99f48d..adb071e8d 100644
--- a/src/fs/gnunet-directory.c
+++ b/src/fs/gnunet-directory.c
@@ -129,7 +129,7 @@ run (void *cls, char *const *args, const char *cfgfile,
129 129
130 if (NULL == args[0]) 130 if (NULL == args[0])
131 { 131 {
132 fprintf (stderr, _("You must specify a filename to inspect.")); 132 FPRINTF (stderr, "%s", _("You must specify a filename to inspect."));
133 ret = 1; 133 ret = 1;
134 return; 134 return;
135 } 135 }
diff --git a/src/fs/gnunet-download.c b/src/fs/gnunet-download.c
index f38805c2b..9e4a8c2f7 100644
--- a/src/fs/gnunet-download.c
+++ b/src/fs/gnunet-download.c
@@ -97,7 +97,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
97 { 97 {
98 case GNUNET_FS_STATUS_DOWNLOAD_START: 98 case GNUNET_FS_STATUS_DOWNLOAD_START:
99 if (verbose > 1) 99 if (verbose > 1)
100 fprintf (stderr, _("Starting download `%s'.\n"), 100 FPRINTF (stderr, _("Starting download `%s'.\n"),
101 info->value.download.filename); 101 info->value.download.filename);
102 break; 102 break;
103 case GNUNET_FS_STATUS_DOWNLOAD_PROGRESS: 103 case GNUNET_FS_STATUS_DOWNLOAD_PROGRESS:
@@ -108,7 +108,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
108 1000LL / 108 1000LL /
109 (info->value.download. 109 (info->value.download.
110 duration.rel_value + 1)); 110 duration.rel_value + 1));
111 fprintf (stdout, 111 FPRINTF (stdout,
112 _("Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"), 112 _("Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"),
113 info->value.download.filename, 113 info->value.download.filename,
114 (unsigned long long) info->value.download.completed, 114 (unsigned long long) info->value.download.completed,
@@ -118,7 +118,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
118 } 118 }
119 break; 119 break;
120 case GNUNET_FS_STATUS_DOWNLOAD_ERROR: 120 case GNUNET_FS_STATUS_DOWNLOAD_ERROR:
121 fprintf (stderr, _("Error downloading: %s.\n"), 121 FPRINTF (stderr, _("Error downloading: %s.\n"),
122 info->value.download.specifics.error.message); 122 info->value.download.specifics.error.message);
123 GNUNET_SCHEDULER_shutdown (); 123 GNUNET_SCHEDULER_shutdown ();
124 break; 124 break;
@@ -126,7 +126,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
126 s = GNUNET_STRINGS_byte_size_fancy (info->value.download.completed * 1000 / 126 s = GNUNET_STRINGS_byte_size_fancy (info->value.download.completed * 1000 /
127 (info->value.download. 127 (info->value.download.
128 duration.rel_value + 1)); 128 duration.rel_value + 1));
129 fprintf (stdout, _("Downloading `%s' done (%s/s).\n"), 129 FPRINTF (stdout, _("Downloading `%s' done (%s/s).\n"),
130 info->value.download.filename, s); 130 info->value.download.filename, s);
131 GNUNET_free (s); 131 GNUNET_free (s);
132 if (info->value.download.dc == dc) 132 if (info->value.download.dc == dc)
@@ -141,7 +141,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
141 case GNUNET_FS_STATUS_DOWNLOAD_INACTIVE: 141 case GNUNET_FS_STATUS_DOWNLOAD_INACTIVE:
142 break; 142 break;
143 default: 143 default:
144 fprintf (stderr, _("Unexpected status: %d\n"), info->status); 144 FPRINTF (stderr, _("Unexpected status: %d\n"), info->status);
145 break; 145 break;
146 } 146 }
147 return NULL; 147 return NULL;
@@ -166,27 +166,27 @@ run (void *cls, char *const *args, const char *cfgfile,
166 166
167 if (NULL == args[0]) 167 if (NULL == args[0])
168 { 168 {
169 fprintf (stderr, _("You need to specify a URI argument.\n")); 169 FPRINTF (stderr, "%s", _("You need to specify a URI argument.\n"));
170 return; 170 return;
171 } 171 }
172 uri = GNUNET_FS_uri_parse (args[0], &emsg); 172 uri = GNUNET_FS_uri_parse (args[0], &emsg);
173 if (NULL == uri) 173 if (NULL == uri)
174 { 174 {
175 fprintf (stderr, _("Failed to parse URI: %s\n"), emsg); 175 FPRINTF (stderr, _("Failed to parse URI: %s\n"), emsg);
176 GNUNET_free (emsg); 176 GNUNET_free (emsg);
177 ret = 1; 177 ret = 1;
178 return; 178 return;
179 } 179 }
180 if ((!GNUNET_FS_uri_test_chk (uri)) && (!GNUNET_FS_uri_test_loc (uri))) 180 if ((!GNUNET_FS_uri_test_chk (uri)) && (!GNUNET_FS_uri_test_loc (uri)))
181 { 181 {
182 fprintf (stderr, _("Only CHK or LOC URIs supported.\n")); 182 FPRINTF (stderr, "%s", _("Only CHK or LOC URIs supported.\n"));
183 ret = 1; 183 ret = 1;
184 GNUNET_FS_uri_destroy (uri); 184 GNUNET_FS_uri_destroy (uri);
185 return; 185 return;
186 } 186 }
187 if (NULL == filename) 187 if (NULL == filename)
188 { 188 {
189 fprintf (stderr, _("Target filename must be specified.\n")); 189 FPRINTF (stderr, "%s", _("Target filename must be specified.\n"));
190 ret = 1; 190 ret = 1;
191 GNUNET_FS_uri_destroy (uri); 191 GNUNET_FS_uri_destroy (uri);
192 return; 192 return;
@@ -200,7 +200,7 @@ run (void *cls, char *const *args, const char *cfgfile,
200 request_parallelism, GNUNET_FS_OPTIONS_END); 200 request_parallelism, GNUNET_FS_OPTIONS_END);
201 if (NULL == ctx) 201 if (NULL == ctx)
202 { 202 {
203 fprintf (stderr, _("Could not initialize `%s' subsystem.\n"), "FS"); 203 FPRINTF (stderr, _("Could not initialize `%s' subsystem.\n"), "FS");
204 GNUNET_FS_uri_destroy (uri); 204 GNUNET_FS_uri_destroy (uri);
205 ret = 1; 205 ret = 1;
206 return; 206 return;
diff --git a/src/fs/gnunet-fs.c b/src/fs/gnunet-fs.c
index dc86ce984..8cf08ec28 100644
--- a/src/fs/gnunet-fs.c
+++ b/src/fs/gnunet-fs.c
@@ -72,9 +72,9 @@ static int
72print_indexed (void *cls, const char *filename, const GNUNET_HashCode * file_id) 72print_indexed (void *cls, const char *filename, const GNUNET_HashCode * file_id)
73{ 73{
74 if (verbose) 74 if (verbose)
75 fprintf (stdout, "%s: %s\n", GNUNET_h2s (file_id), filename); 75 FPRINTF (stdout, "%s: %s\n", GNUNET_h2s (file_id), filename);
76 else 76 else
77 fprintf (stdout, "%s\n", filename); 77 FPRINTF (stdout, "%s\n", filename);
78 return GNUNET_OK; 78 return GNUNET_OK;
79} 79}
80 80
diff --git a/src/fs/gnunet-pseudonym.c b/src/fs/gnunet-pseudonym.c
index ce0d24506..412ddd2b0 100644
--- a/src/fs/gnunet-pseudonym.c
+++ b/src/fs/gnunet-pseudonym.c
@@ -100,7 +100,7 @@ ns_printer (void *cls, const char *name, const GNUNET_HashCode * id)
100 struct GNUNET_CRYPTO_HashAsciiEncoded enc; 100 struct GNUNET_CRYPTO_HashAsciiEncoded enc;
101 101
102 GNUNET_CRYPTO_hash_to_enc (id, &enc); 102 GNUNET_CRYPTO_hash_to_enc (id, &enc);
103 fprintf (stdout, "%s (%s)\n", name, (const char *) &enc); 103 FPRINTF (stdout, "%s (%s)\n", name, (const char *) &enc);
104} 104}
105 105
106 106
@@ -116,9 +116,9 @@ pseudo_printer (void *cls, const GNUNET_HashCode * pseudonym,
116 GNUNET_break (0); 116 GNUNET_break (0);
117 return GNUNET_OK; 117 return GNUNET_OK;
118 } 118 }
119 fprintf (stdout, "%s (%d):\n", id, rating); 119 FPRINTF (stdout, "%s (%d):\n", id, rating);
120 GNUNET_CONTAINER_meta_data_iterate (md, &EXTRACTOR_meta_data_print, stdout); 120 GNUNET_CONTAINER_meta_data_iterate (md, &EXTRACTOR_meta_data_print, stdout);
121 fprintf (stdout, "\n"); 121 FPRINTF (stdout, "%s", "\n");
122 GNUNET_free (id); 122 GNUNET_free (id);
123 return GNUNET_OK; 123 return GNUNET_OK;
124} 124}
@@ -133,7 +133,7 @@ post_advertising (void *cls, const struct GNUNET_FS_Uri *uri, const char *emsg)
133 133
134 if (emsg != NULL) 134 if (emsg != NULL)
135 { 135 {
136 fprintf (stderr, "%s", emsg); 136 FPRINTF (stderr, "%s", emsg);
137 ret = 1; 137 ret = 1;
138 } 138 }
139 if (ns != NULL) 139 if (ns != NULL)
@@ -237,16 +237,16 @@ run (void *cls, char *const *args, const char *cfgfile,
237 else 237 else
238 { 238 {
239 if (ksk_uri != NULL) 239 if (ksk_uri != NULL)
240 fprintf (stderr, _("Option `%s' ignored\n"), "-k"); 240 FPRINTF (stderr, _("Option `%s' ignored\n"), "-k");
241 } 241 }
242 } 242 }
243 } 243 }
244 else 244 else
245 { 245 {
246 if (root_identifier != NULL) 246 if (root_identifier != NULL)
247 fprintf (stderr, _("Option `%s' ignored\n"), "-r"); 247 FPRINTF (stderr, _("Option `%s' ignored\n"), "-r");
248 if (ksk_uri != NULL) 248 if (ksk_uri != NULL)
249 fprintf (stderr, _("Option `%s' ignored\n"), "-k"); 249 FPRINTF (stderr, _("Option `%s' ignored\n"), "-k");
250 } 250 }
251 251
252 post_advertising (NULL, NULL, NULL); 252 post_advertising (NULL, NULL, NULL);
diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c
index ffcdefdc6..dd3bf6810 100644
--- a/src/fs/gnunet-publish.c
+++ b/src/fs/gnunet-publish.c
@@ -115,7 +115,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
115 if (verbose) 115 if (verbose)
116 { 116 {
117 s = GNUNET_STRINGS_relative_time_to_string (info->value.publish.eta); 117 s = GNUNET_STRINGS_relative_time_to_string (info->value.publish.eta);
118 fprintf (stdout, _("Publishing `%s' at %llu/%llu (%s remaining)\n"), 118 FPRINTF (stdout, _("Publishing `%s' at %llu/%llu (%s remaining)\n"),
119 info->value.publish.filename, 119 info->value.publish.filename,
120 (unsigned long long) info->value.publish.completed, 120 (unsigned long long) info->value.publish.completed,
121 (unsigned long long) info->value.publish.size, s); 121 (unsigned long long) info->value.publish.size, s);
@@ -123,7 +123,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
123 } 123 }
124 break; 124 break;
125 case GNUNET_FS_STATUS_PUBLISH_ERROR: 125 case GNUNET_FS_STATUS_PUBLISH_ERROR:
126 fprintf (stderr, _("Error publishing: %s.\n"), 126 FPRINTF (stderr, _("Error publishing: %s.\n"),
127 info->value.publish.specifics.error.message); 127 info->value.publish.specifics.error.message);
128 if (kill_task != GNUNET_SCHEDULER_NO_TASK) 128 if (kill_task != GNUNET_SCHEDULER_NO_TASK)
129 { 129 {
@@ -134,11 +134,11 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
134 GNUNET_SCHEDULER_REASON_PREREQ_DONE); 134 GNUNET_SCHEDULER_REASON_PREREQ_DONE);
135 break; 135 break;
136 case GNUNET_FS_STATUS_PUBLISH_COMPLETED: 136 case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
137 fprintf (stdout, _("Publishing `%s' done.\n"), 137 FPRINTF (stdout, _("Publishing `%s' done.\n"),
138 info->value.publish.filename); 138 info->value.publish.filename);
139 s = GNUNET_FS_uri_to_string (info->value.publish.specifics. 139 s = GNUNET_FS_uri_to_string (info->value.publish.specifics.
140 completed.chk_uri); 140 completed.chk_uri);
141 fprintf (stdout, _("URI is `%s'.\n"), s); 141 FPRINTF (stdout, _("URI is `%s'.\n"), s);
142 GNUNET_free (s); 142 GNUNET_free (s);
143 if (info->value.publish.pctx == NULL) 143 if (info->value.publish.pctx == NULL)
144 { 144 {
@@ -157,10 +157,10 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
157 case GNUNET_FS_STATUS_UNINDEX_PROGRESS: 157 case GNUNET_FS_STATUS_UNINDEX_PROGRESS:
158 return NULL; 158 return NULL;
159 case GNUNET_FS_STATUS_UNINDEX_COMPLETED: 159 case GNUNET_FS_STATUS_UNINDEX_COMPLETED:
160 fprintf (stderr, _("Cleanup after abort complete.\n")); 160 FPRINTF (stderr, "%s", _("Cleanup after abort complete.\n"));
161 return NULL; 161 return NULL;
162 default: 162 default:
163 fprintf (stderr, _("Unexpected status: %d\n"), info->status); 163 FPRINTF (stderr, _("Unexpected status: %d\n"), info->status);
164 return NULL; 164 return NULL;
165 } 165 }
166 return ""; /* non-null */ 166 return ""; /* non-null */
@@ -190,7 +190,7 @@ meta_printer (void *cls, const char *plugin_name, enum EXTRACTOR_MetaType type,
190 return 0; 190 return 0;
191 if (type == EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME) 191 if (type == EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME)
192 return 0; 192 return 0;
193 fprintf (stdout, "\t%s - %s\n", EXTRACTOR_metatype_to_string (type), data); 193 FPRINTF (stdout, "\t%s - %s\n", EXTRACTOR_metatype_to_string (type), data);
194 return 0; 194 return 0;
195} 195}
196 196
@@ -206,7 +206,7 @@ meta_printer (void *cls, const char *plugin_name, enum EXTRACTOR_MetaType type,
206static int 206static int
207keyword_printer (void *cls, const char *keyword, int is_mandatory) 207keyword_printer (void *cls, const char *keyword, int is_mandatory)
208{ 208{
209 fprintf (stdout, "\t%s\n", keyword); 209 FPRINTF (stdout, "\t%s\n", keyword);
210 return GNUNET_OK; 210 return GNUNET_OK;
211} 211}
212 212
@@ -269,14 +269,14 @@ publish_inspector (void *cls, struct GNUNET_FS_FileInformation *fi,
269 fn = GNUNET_CONTAINER_meta_data_get_by_type (m, 269 fn = GNUNET_CONTAINER_meta_data_get_by_type (m,
270 EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME); 270 EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME);
271 fs = GNUNET_STRINGS_byte_size_fancy (length); 271 fs = GNUNET_STRINGS_byte_size_fancy (length);
272 fprintf (stdout, _("Meta data for file `%s' (%s)\n"), fn, fs); 272 FPRINTF (stdout, _("Meta data for file `%s' (%s)\n"), fn, fs);
273 GNUNET_CONTAINER_meta_data_iterate (m, &meta_printer, NULL); 273 GNUNET_CONTAINER_meta_data_iterate (m, &meta_printer, NULL);
274 fprintf (stdout, _("Keywords for file `%s' (%s)\n"), fn, fs); 274 FPRINTF (stdout, _("Keywords for file `%s' (%s)\n"), fn, fs);
275 GNUNET_free (fn); 275 GNUNET_free (fn);
276 GNUNET_free (fs); 276 GNUNET_free (fs);
277 if (NULL != *uri) 277 if (NULL != *uri)
278 GNUNET_FS_uri_ksk_get_keywords (*uri, &keyword_printer, NULL); 278 GNUNET_FS_uri_ksk_get_keywords (*uri, &keyword_printer, NULL);
279 fprintf (stdout, "\n"); 279 FPRINTF (stdout, "%s", "\n");
280 } 280 }
281 if (GNUNET_YES == GNUNET_FS_meta_data_test_for_directory (m)) 281 if (GNUNET_YES == GNUNET_FS_meta_data_test_for_directory (m))
282 GNUNET_FS_file_information_inspect (fi, &publish_inspector, fi); 282 GNUNET_FS_file_information_inspect (fi, &publish_inspector, fi);
@@ -293,7 +293,7 @@ uri_sks_continuation (void *cls, const struct GNUNET_FS_Uri *ksk_uri,
293{ 293{
294 if (emsg != NULL) 294 if (emsg != NULL)
295 { 295 {
296 fprintf (stderr, "%s\n", emsg); 296 FPRINTF (stderr, "%s\n", emsg);
297 ret = 1; 297 ret = 1;
298 } 298 }
299 GNUNET_FS_uri_destroy (uri); 299 GNUNET_FS_uri_destroy (uri);
@@ -314,7 +314,7 @@ uri_ksk_continuation (void *cls, const struct GNUNET_FS_Uri *ksk_uri,
314 314
315 if (emsg != NULL) 315 if (emsg != NULL)
316 { 316 {
317 fprintf (stderr, "%s\n", emsg); 317 FPRINTF (stderr, "%s\n", emsg);
318 ret = 1; 318 ret = 1;
319 } 319 }
320 if (pseudonym != NULL) 320 if (pseudonym != NULL)
@@ -322,7 +322,7 @@ uri_ksk_continuation (void *cls, const struct GNUNET_FS_Uri *ksk_uri,
322 ns = GNUNET_FS_namespace_create (ctx, pseudonym); 322 ns = GNUNET_FS_namespace_create (ctx, pseudonym);
323 if (ns == NULL) 323 if (ns == NULL)
324 { 324 {
325 fprintf (stderr, _("Failed to create namespace `%s'\n"), pseudonym); 325 FPRINTF (stderr, _("Failed to create namespace `%s'\n"), pseudonym);
326 ret = 1; 326 ret = 1;
327 } 327 }
328 else 328 else
@@ -385,7 +385,7 @@ run (void *cls, char *const *args, const char *cfgfile,
385 { 385 {
386 if (NULL == this_id) 386 if (NULL == this_id)
387 { 387 {
388 fprintf (stderr, _("Option `%s' is required when using option `%s'.\n"), 388 FPRINTF (stderr, _("Option `%s' is required when using option `%s'.\n"),
389 "-t", "-P"); 389 "-t", "-P");
390 ret = -1; 390 ret = -1;
391 return; 391 return;
@@ -395,14 +395,14 @@ run (void *cls, char *const *args, const char *cfgfile,
395 { /* ordinary insertion checks */ 395 { /* ordinary insertion checks */
396 if (NULL != next_id) 396 if (NULL != next_id)
397 { 397 {
398 fprintf (stderr, _("Option `%s' makes no sense without option `%s'.\n"), 398 FPRINTF (stderr, _("Option `%s' makes no sense without option `%s'.\n"),
399 "-N", "-P"); 399 "-N", "-P");
400 ret = -1; 400 ret = -1;
401 return; 401 return;
402 } 402 }
403 if (NULL != this_id) 403 if (NULL != this_id)
404 { 404 {
405 fprintf (stderr, _("Option `%s' makes no sense without option `%s'.\n"), 405 FPRINTF (stderr, _("Option `%s' makes no sense without option `%s'.\n"),
406 "-t", "-P"); 406 "-t", "-P");
407 ret = -1; 407 ret = -1;
408 return; 408 return;
@@ -414,7 +414,7 @@ run (void *cls, char *const *args, const char *cfgfile,
414 GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END); 414 GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END);
415 if (NULL == ctx) 415 if (NULL == ctx)
416 { 416 {
417 fprintf (stderr, _("Could not initialize `%s' subsystem.\n"), "FS"); 417 FPRINTF (stderr, _("Could not initialize `%s' subsystem.\n"), "FS");
418 ret = 1; 418 ret = 1;
419 return; 419 return;
420 } 420 }
@@ -424,7 +424,7 @@ run (void *cls, char *const *args, const char *cfgfile,
424 namespace = GNUNET_FS_namespace_create (ctx, pseudonym); 424 namespace = GNUNET_FS_namespace_create (ctx, pseudonym);
425 if (NULL == namespace) 425 if (NULL == namespace)
426 { 426 {
427 fprintf (stderr, _("Could not create namespace `%s'\n"), pseudonym); 427 FPRINTF (stderr, _("Could not create namespace `%s'\n"), pseudonym);
428 GNUNET_FS_stop (ctx); 428 GNUNET_FS_stop (ctx);
429 ret = 1; 429 ret = 1;
430 return; 430 return;
@@ -436,7 +436,7 @@ run (void *cls, char *const *args, const char *cfgfile,
436 uri = GNUNET_FS_uri_parse (uri_string, &emsg); 436 uri = GNUNET_FS_uri_parse (uri_string, &emsg);
437 if (uri == NULL) 437 if (uri == NULL)
438 { 438 {
439 fprintf (stderr, _("Failed to parse URI: %s\n"), emsg); 439 FPRINTF (stderr, _("Failed to parse URI: %s\n"), emsg);
440 GNUNET_free (emsg); 440 GNUNET_free (emsg);
441 if (namespace != NULL) 441 if (namespace != NULL)
442 GNUNET_FS_namespace_delete (namespace, GNUNET_NO); 442 GNUNET_FS_namespace_delete (namespace, GNUNET_NO);
@@ -494,7 +494,7 @@ run (void *cls, char *const *args, const char *cfgfile,
494 EXTRACTOR_plugin_remove_all (plugins); 494 EXTRACTOR_plugin_remove_all (plugins);
495 if (fi == NULL) 495 if (fi == NULL)
496 { 496 {
497 fprintf (stderr, _("Could not publish `%s': %s\n"), args[0], emsg); 497 FPRINTF (stderr, _("Could not publish `%s': %s\n"), args[0], emsg);
498 GNUNET_free (emsg); 498 GNUNET_free (emsg);
499 if (namespace != NULL) 499 if (namespace != NULL)
500 GNUNET_FS_namespace_delete (namespace, GNUNET_NO); 500 GNUNET_FS_namespace_delete (namespace, GNUNET_NO);
@@ -517,7 +517,7 @@ run (void *cls, char *const *args, const char *cfgfile,
517 GNUNET_FS_PUBLISH_OPTION_NONE); 517 GNUNET_FS_PUBLISH_OPTION_NONE);
518 if (NULL == pc) 518 if (NULL == pc)
519 { 519 {
520 fprintf (stderr, _("Could not start publishing.\n")); 520 FPRINTF (stderr, "%s", _("Could not start publishing.\n"));
521 GNUNET_FS_stop (ctx); 521 GNUNET_FS_stop (ctx);
522 ret = 1; 522 ret = 1;
523 return; 523 return;
diff --git a/src/fs/gnunet-search.c b/src/fs/gnunet-search.c
index 3a30f6c2b..c221a30f8 100644
--- a/src/fs/gnunet-search.c
+++ b/src/fs/gnunet-search.c
@@ -107,7 +107,7 @@ clean_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
107 GNUNET_DISK_PERM_USER_READ | 107 GNUNET_DISK_PERM_USER_READ |
108 GNUNET_DISK_PERM_USER_WRITE)) 108 GNUNET_DISK_PERM_USER_WRITE))
109 { 109 {
110 fprintf (stderr, 110 FPRINTF (stderr,
111 _("Failed to write directory with search results to `%s'\n"), 111 _("Failed to write directory with search results to `%s'\n"),
112 output_filename); 112 output_filename);
113 } 113 }
@@ -178,7 +178,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
178 /* ignore */ 178 /* ignore */
179 break; 179 break;
180 case GNUNET_FS_STATUS_SEARCH_ERROR: 180 case GNUNET_FS_STATUS_SEARCH_ERROR:
181 fprintf (stderr, _("Error searching: %s.\n"), 181 FPRINTF (stderr, _("Error searching: %s.\n"),
182 info->value.search.specifics.error.message); 182 info->value.search.specifics.error.message);
183 GNUNET_SCHEDULER_shutdown (); 183 GNUNET_SCHEDULER_shutdown ();
184 break; 184 break;
@@ -187,7 +187,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
187 GNUNET_SCHEDULER_REASON_PREREQ_DONE); 187 GNUNET_SCHEDULER_REASON_PREREQ_DONE);
188 break; 188 break;
189 default: 189 default:
190 fprintf (stderr, _("Unexpected status: %d\n"), info->status); 190 FPRINTF (stderr, _("Unexpected status: %d\n"), info->status);
191 break; 191 break;
192 } 192 }
193 return NULL; 193 return NULL;
@@ -228,7 +228,7 @@ run (void *cls, char *const *args, const char *cfgfile,
228 uri = GNUNET_FS_uri_ksk_create_from_args (argc, (const char **) args); 228 uri = GNUNET_FS_uri_ksk_create_from_args (argc, (const char **) args);
229 if (NULL == uri) 229 if (NULL == uri)
230 { 230 {
231 fprintf (stderr, _("Could not create keyword URI from arguments.\n")); 231 FPRINTF (stderr, "%s", _("Could not create keyword URI from arguments.\n"));
232 ret = 1; 232 ret = 1;
233 return; 233 return;
234 } 234 }
@@ -238,7 +238,7 @@ run (void *cls, char *const *args, const char *cfgfile,
238 GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END); 238 GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END);
239 if (NULL == ctx) 239 if (NULL == ctx)
240 { 240 {
241 fprintf (stderr, _("Could not initialize `%s' subsystem.\n"), "FS"); 241 FPRINTF (stderr, _("Could not initialize `%s' subsystem.\n"), "FS");
242 GNUNET_FS_uri_destroy (uri); 242 GNUNET_FS_uri_destroy (uri);
243 ret = 1; 243 ret = 1;
244 return; 244 return;
@@ -252,7 +252,7 @@ run (void *cls, char *const *args, const char *cfgfile,
252 GNUNET_FS_uri_destroy (uri); 252 GNUNET_FS_uri_destroy (uri);
253 if (NULL == sc) 253 if (NULL == sc)
254 { 254 {
255 fprintf (stderr, _("Could not start searching.\n")); 255 FPRINTF (stderr, "%s", _("Could not start searching.\n"));
256 GNUNET_FS_stop (ctx); 256 GNUNET_FS_stop (ctx);
257 ret = 1; 257 ret = 1;
258 return; 258 return;
diff --git a/src/fs/gnunet-unindex.c b/src/fs/gnunet-unindex.c
index 25560ca10..3e8308df2 100644
--- a/src/fs/gnunet-unindex.c
+++ b/src/fs/gnunet-unindex.c
@@ -86,19 +86,19 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
86 if (verbose) 86 if (verbose)
87 { 87 {
88 s = GNUNET_STRINGS_relative_time_to_string (info->value.unindex.eta); 88 s = GNUNET_STRINGS_relative_time_to_string (info->value.unindex.eta);
89 fprintf (stdout, _("Unindexing at %llu/%llu (%s remaining)\n"), 89 FPRINTF (stdout, _("Unindexing at %llu/%llu (%s remaining)\n"),
90 (unsigned long long) info->value.unindex.completed, 90 (unsigned long long) info->value.unindex.completed,
91 (unsigned long long) info->value.unindex.size, s); 91 (unsigned long long) info->value.unindex.size, s);
92 GNUNET_free (s); 92 GNUNET_free (s);
93 } 93 }
94 break; 94 break;
95 case GNUNET_FS_STATUS_UNINDEX_ERROR: 95 case GNUNET_FS_STATUS_UNINDEX_ERROR:
96 fprintf (stderr, _("Error unindexing: %s.\n"), 96 FPRINTF (stderr, _("Error unindexing: %s.\n"),
97 info->value.unindex.specifics.error.message); 97 info->value.unindex.specifics.error.message);
98 GNUNET_SCHEDULER_shutdown (); 98 GNUNET_SCHEDULER_shutdown ();
99 break; 99 break;
100 case GNUNET_FS_STATUS_UNINDEX_COMPLETED: 100 case GNUNET_FS_STATUS_UNINDEX_COMPLETED:
101 fprintf (stdout, _("Unindexing done.\n")); 101 FPRINTF (stdout, "%s", _("Unindexing done.\n"));
102 GNUNET_SCHEDULER_shutdown (); 102 GNUNET_SCHEDULER_shutdown ();
103 break; 103 break;
104 case GNUNET_FS_STATUS_UNINDEX_STOPPED: 104 case GNUNET_FS_STATUS_UNINDEX_STOPPED:
@@ -106,7 +106,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
106 GNUNET_SCHEDULER_REASON_PREREQ_DONE); 106 GNUNET_SCHEDULER_REASON_PREREQ_DONE);
107 break; 107 break;
108 default: 108 default:
109 fprintf (stderr, _("Unexpected status: %d\n"), info->status); 109 FPRINTF (stderr, _("Unexpected status: %d\n"), info->status);
110 break; 110 break;
111 } 111 }
112 return NULL; 112 return NULL;
@@ -138,14 +138,14 @@ run (void *cls, char *const *args, const char *cfgfile,
138 GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END); 138 GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END);
139 if (NULL == ctx) 139 if (NULL == ctx)
140 { 140 {
141 fprintf (stderr, _("Could not initialize `%s' subsystem.\n"), "FS"); 141 FPRINTF (stderr, _("Could not initialize `%s' subsystem.\n"), "FS");
142 ret = 1; 142 ret = 1;
143 return; 143 return;
144 } 144 }
145 uc = GNUNET_FS_unindex_start (ctx, args[0], NULL); 145 uc = GNUNET_FS_unindex_start (ctx, args[0], NULL);
146 if (NULL == uc) 146 if (NULL == uc)
147 { 147 {
148 fprintf (stderr, _("Could not start unindex operation.\n")); 148 FPRINTF (stderr, "%s", _("Could not start unindex operation.\n"));
149 GNUNET_FS_stop (ctx); 149 GNUNET_FS_stop (ctx);
150 return; 150 return;
151 } 151 }
diff --git a/src/fs/perf_gnunet_service_fs_p2p.c b/src/fs/perf_gnunet_service_fs_p2p.c
index bb8c8d8c2..6b9b1abd5 100644
--- a/src/fs/perf_gnunet_service_fs_p2p.c
+++ b/src/fs/perf_gnunet_service_fs_p2p.c
@@ -120,7 +120,7 @@ print_stat (void *cls, const char *subsystem, const char *name, uint64_t value,
120{ 120{
121 struct StatMaster *sm = cls; 121 struct StatMaster *sm = cls;
122 122
123 fprintf (stderr, "Peer %2u: %12s/%50s = %12llu\n", sm->daemon, subsystem, 123 FPRINTF (stderr, "Peer %2u: %12s/%50s = %12llu\n", sm->daemon, subsystem,
124 name, (unsigned long long) value); 124 name, (unsigned long long) value);
125 return GNUNET_OK; 125 return GNUNET_OK;
126} 126}
@@ -199,7 +199,7 @@ do_report (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
199 fancy = 199 fancy =
200 GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) * 200 GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) *
201 1000LL / del.rel_value); 201 1000LL / del.rel_value);
202 fprintf (stdout, "Download speed was %s/s\n", fancy); 202 FPRINTF (stdout, "Download speed was %s/s\n", fancy);
203 GNUNET_free (fancy); 203 GNUNET_free (fancy);
204 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Finished download, shutting down\n", 204 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Finished download, shutting down\n",
205 (unsigned long long) FILESIZE); 205 (unsigned long long) FILESIZE);
diff --git a/src/fs/perf_gnunet_service_fs_p2p_trust.c b/src/fs/perf_gnunet_service_fs_p2p_trust.c
index 9f5a36b7e..94b7648f8 100644
--- a/src/fs/perf_gnunet_service_fs_p2p_trust.c
+++ b/src/fs/perf_gnunet_service_fs_p2p_trust.c
@@ -153,7 +153,7 @@ print_stat (void *cls, const char *subsystem, const char *name, uint64_t value,
153{ 153{
154 struct StatMaster *sm = cls; 154 struct StatMaster *sm = cls;
155 155
156 fprintf (stderr, "Peer %2u: %12s/%50s = %12llu\n", sm->daemon, subsystem, 156 FPRINTF (stderr, "Peer %2u: %12s/%50s = %12llu\n", sm->daemon, subsystem,
157 name, (unsigned long long) value); 157 name, (unsigned long long) value);
158 return GNUNET_OK; 158 return GNUNET_OK;
159} 159}
@@ -234,7 +234,7 @@ do_report (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
234 fancy = 234 fancy =
235 GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) * 235 GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) *
236 1000LL / del.rel_value); 236 1000LL / del.rel_value);
237 fprintf (stderr, "Download speed of type `%s' was %s/s\n", type, fancy); 237 FPRINTF (stderr, "Download speed of type `%s' was %s/s\n", type, fancy);
238 GNUNET_free (fancy); 238 GNUNET_free (fancy);
239 if (NUM_DAEMONS != ++download_counter) 239 if (NUM_DAEMONS != ++download_counter)
240 return; /* more downloads to come */ 240 return; /* more downloads to come */
diff --git a/src/fs/test_fs_directory.c b/src/fs/test_fs_directory.c
index 81012e764..96ad29cb4 100644
--- a/src/fs/test_fs_directory.c
+++ b/src/fs/test_fs_directory.c
@@ -59,7 +59,7 @@ processor (void *cls, const char *filename, const struct GNUNET_FS_Uri *uri,
59 return; 59 return;
60 } 60 }
61 } 61 }
62 fprintf (stderr, "Error at %s:%d\n", __FILE__, __LINE__); 62 FPRINTF (stderr, "Error at %s:%d\n", __FILE__, __LINE__);
63} 63}
64 64
65static int 65static int
@@ -131,7 +131,7 @@ testDirectory (unsigned int i)
131 GNUNET_FS_directory_builder_finish (db, &dlen, (void **) &data); 131 GNUNET_FS_directory_builder_finish (db, &dlen, (void **) &data);
132 s = GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_duration 132 s = GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_duration
133 (start)); 133 (start));
134 fprintf (stdout, 134 FPRINTF (stdout,
135 "Creating directory with %u entires and total size %llu took %s\n", 135 "Creating directory with %u entires and total size %llu took %s\n",
136 i, (unsigned long long) dlen, s); 136 i, (unsigned long long) dlen, s);
137 GNUNET_free (s); 137 GNUNET_free (s);
diff --git a/src/fs/test_fs_download.c b/src/fs/test_fs_download.c
index 19ef6e76a..93ad0cbba 100644
--- a/src/fs/test_fs_download.c
+++ b/src/fs/test_fs_download.c
@@ -190,14 +190,14 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
190#endif 190#endif
191 break; 191 break;
192 case GNUNET_FS_STATUS_PUBLISH_ERROR: 192 case GNUNET_FS_STATUS_PUBLISH_ERROR:
193 fprintf (stderr, "Error publishing file: %s\n", 193 FPRINTF (stderr, "Error publishing file: %s\n",
194 event->value.publish.specifics.error.message); 194 event->value.publish.specifics.error.message);
195 GNUNET_break (0); 195 GNUNET_break (0);
196 GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL, 196 GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
197 GNUNET_SCHEDULER_REASON_PREREQ_DONE); 197 GNUNET_SCHEDULER_REASON_PREREQ_DONE);
198 break; 198 break;
199 case GNUNET_FS_STATUS_DOWNLOAD_ERROR: 199 case GNUNET_FS_STATUS_DOWNLOAD_ERROR:
200 fprintf (stderr, "Error downloading file: %s\n", 200 FPRINTF (stderr, "Error downloading file: %s\n",
201 event->value.download.specifics.error.message); 201 event->value.download.specifics.error.message);
202 GNUNET_SCHEDULER_add_now (&abort_download_task, NULL); 202 GNUNET_SCHEDULER_add_now (&abort_download_task, NULL);
203 break; 203 break;
diff --git a/src/fs/test_fs_download_indexed.c b/src/fs/test_fs_download_indexed.c
index 3f932f783..6592f6efa 100644
--- a/src/fs/test_fs_download_indexed.c
+++ b/src/fs/test_fs_download_indexed.c
@@ -191,14 +191,14 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
191#endif 191#endif
192 break; 192 break;
193 case GNUNET_FS_STATUS_PUBLISH_ERROR: 193 case GNUNET_FS_STATUS_PUBLISH_ERROR:
194 fprintf (stderr, "Error publishing file: %s\n", 194 FPRINTF (stderr, "Error publishing file: %s\n",
195 event->value.publish.specifics.error.message); 195 event->value.publish.specifics.error.message);
196 GNUNET_break (0); 196 GNUNET_break (0);
197 GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL, 197 GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
198 GNUNET_SCHEDULER_REASON_PREREQ_DONE); 198 GNUNET_SCHEDULER_REASON_PREREQ_DONE);
199 break; 199 break;
200 case GNUNET_FS_STATUS_DOWNLOAD_ERROR: 200 case GNUNET_FS_STATUS_DOWNLOAD_ERROR:
201 fprintf (stderr, "Error downloading file: %s\n", 201 FPRINTF (stderr, "Error downloading file: %s\n",
202 event->value.download.specifics.error.message); 202 event->value.download.specifics.error.message);
203 GNUNET_SCHEDULER_add_now (&abort_download_task, NULL); 203 GNUNET_SCHEDULER_add_now (&abort_download_task, NULL);
204 break; 204 break;
diff --git a/src/fs/test_fs_download_persistence.c b/src/fs/test_fs_download_persistence.c
index 9bc37235e..1e1ed22f8 100644
--- a/src/fs/test_fs_download_persistence.c
+++ b/src/fs/test_fs_download_persistence.c
@@ -211,14 +211,14 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
211#endif 211#endif
212 break; 212 break;
213 case GNUNET_FS_STATUS_PUBLISH_ERROR: 213 case GNUNET_FS_STATUS_PUBLISH_ERROR:
214 fprintf (stderr, "Error publishing file: %s\n", 214 FPRINTF (stderr, "Error publishing file: %s\n",
215 event->value.publish.specifics.error.message); 215 event->value.publish.specifics.error.message);
216 GNUNET_break (0); 216 GNUNET_break (0);
217 GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL, 217 GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
218 GNUNET_SCHEDULER_REASON_PREREQ_DONE); 218 GNUNET_SCHEDULER_REASON_PREREQ_DONE);
219 break; 219 break;
220 case GNUNET_FS_STATUS_DOWNLOAD_ERROR: 220 case GNUNET_FS_STATUS_DOWNLOAD_ERROR:
221 fprintf (stderr, "Error downloading file: %s\n", 221 FPRINTF (stderr, "Error downloading file: %s\n",
222 event->value.download.specifics.error.message); 222 event->value.download.specifics.error.message);
223 GNUNET_SCHEDULER_add_now (&abort_download_task, NULL); 223 GNUNET_SCHEDULER_add_now (&abort_download_task, NULL);
224 break; 224 break;
diff --git a/src/fs/test_fs_download_recursive.c b/src/fs/test_fs_download_recursive.c
index cede523ec..29d15c492 100644
--- a/src/fs/test_fs_download_recursive.c
+++ b/src/fs/test_fs_download_recursive.c
@@ -213,14 +213,14 @@ eventCallback (void *cls, const GNUNET_FSUI_Event * event)
213#endif 213#endif
214 break; 214 break;
215 case GNUNET_FSUI_unindex_error: 215 case GNUNET_FSUI_unindex_error:
216 fprintf (stderr, "Error unindexing: %s\n", 216 FPRINTF (stderr, "Error unindexing: %s\n",
217 event->data.UnindexError.message); 217 event->data.UnindexError.message);
218 break; 218 break;
219 case GNUNET_FSUI_upload_error: 219 case GNUNET_FSUI_upload_error:
220 fprintf (stderr, "Error uploading: %s\n", event->data.UploadError.message); 220 FPRINTF (stderr, "Error uploading: %s\n", event->data.UploadError.message);
221 break; 221 break;
222 case GNUNET_FSUI_download_error: 222 case GNUNET_FSUI_download_error:
223 fprintf (stderr, "Error downloading: %s\n", 223 FPRINTF (stderr, "Error downloading: %s\n",
224 event->data.DownloadError.message); 224 event->data.DownloadError.message);
225 break; 225 break;
226 case GNUNET_FSUI_download_aborted: 226 case GNUNET_FSUI_download_aborted:
@@ -277,7 +277,7 @@ main (int argc, char *argv[])
277 GNUNET_GC_free (cfg); 277 GNUNET_GC_free (cfg);
278 return -1; 278 return -1;
279 } 279 }
280 fprintf (stderr, "Setup...\n"); 280 FPRINTF (stderr, "%s", "Setup...\n");
281#if START_DAEMON 281#if START_DAEMON
282 GNUNET_disk_directory_remove (NULL, 282 GNUNET_disk_directory_remove (NULL,
283 "/tmp/gnunet-fsui-recursive_download_test/"); 283 "/tmp/gnunet-fsui-recursive_download_test/");
@@ -297,7 +297,7 @@ main (int argc, char *argv[])
297 kuri = 297 kuri =
298 GNUNET_ECRS_keyword_command_line_to_uri (ectx, 2, 298 GNUNET_ECRS_keyword_command_line_to_uri (ectx, 2,
299 (const char **) keywords); 299 (const char **) keywords);
300 fprintf (stderr, "Uploading...\n"); 300 FPRINTF (stderr, "%s", "Uploading...\n");
301 waitForEvent = GNUNET_FSUI_upload_completed; 301 waitForEvent = GNUNET_FSUI_upload_completed;
302 upload = 302 upload =
303 GNUNET_FSUI_upload_start (ctx, fn, 303 GNUNET_FSUI_upload_start (ctx, fn,
@@ -322,7 +322,7 @@ main (int argc, char *argv[])
322 upload = NULL; 322 upload = NULL;
323 CHECK (upURI != NULL); 323 CHECK (upURI != NULL);
324 324
325 fprintf (stderr, "Downloading...\n"); 325 FPRINTF (stderr, "%s", "Downloading...\n");
326 waitForEvent = GNUNET_FSUI_download_completed; 326 waitForEvent = GNUNET_FSUI_download_completed;
327 fn43 = makeName (43); 327 fn43 = makeName (43);
328 download = 328 download =
@@ -341,7 +341,7 @@ main (int argc, char *argv[])
341 break; 341 break;
342 } 342 }
343FAILURE: 343FAILURE:
344 fprintf (stderr, "Cleanup...\n"); 344 FPRINTF (stderr, "%s", "Cleanup...\n");
345 if (meta != NULL) 345 if (meta != NULL)
346 GNUNET_meta_data_destroy (meta); 346 GNUNET_meta_data_destroy (meta);
347 if (ctx != NULL) 347 if (ctx != NULL)
diff --git a/src/fs/test_fs_file_information.c b/src/fs/test_fs_file_information.c
index a459c565f..34ac3285e 100644
--- a/src/fs/test_fs_file_information.c
+++ b/src/fs/test_fs_file_information.c
@@ -151,8 +151,8 @@ testThumbnail ()
151 EXTRACTOR_OPTION_DEFAULT_POLICY); 151 EXTRACTOR_OPTION_DEFAULT_POLICY);
152 if (ex == NULL) 152 if (ex == NULL)
153 { 153 {
154 fprintf (stderr, 154 FPRINTF (stderr,
155 "Test incomplete, have no GTK thumbnail extractor available.\n"); 155 "Test incomplete, have no GTK thumbnail extractor available.\n", NULL);
156 return 0; /* can not test, no thumbnailer */ 156 return 0; /* can not test, no thumbnailer */
157 } 157 }
158 ex = EXTRACTOR_plugin_add_config (ex, "mime", 158 ex = EXTRACTOR_plugin_add_config (ex, "mime",
diff --git a/src/fs/test_fs_getopt.c b/src/fs/test_fs_getopt.c
index 2b0a9fca8..571346f2c 100644
--- a/src/fs/test_fs_getopt.c
+++ b/src/fs/test_fs_getopt.c
@@ -35,6 +35,6 @@ main (int argc, char *argv[])
35 "WARNING", 35 "WARNING",
36#endif 36#endif
37 NULL); 37 NULL);
38 fprintf (stderr, "WARNING: testcase not yet written.\n"); 38 FPRINTF (stderr, "%s", "WARNING: testcase not yet written.\n");
39 return 0; /* testcase passed */ 39 return 0; /* testcase passed */
40} 40}
diff --git a/src/fs/test_fs_list_indexed.c b/src/fs/test_fs_list_indexed.c
index 870f51a4a..8a847ba2b 100644
--- a/src/fs/test_fs_list_indexed.c
+++ b/src/fs/test_fs_list_indexed.c
@@ -131,7 +131,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
131 break; 131 break;
132 case GNUNET_FS_STATUS_PUBLISH_ERROR: 132 case GNUNET_FS_STATUS_PUBLISH_ERROR:
133 ret = event->value.publish.cctx; 133 ret = event->value.publish.cctx;
134 fprintf (stderr, "Error publishing file: %s\n", 134 FPRINTF (stderr, "Error publishing file: %s\n",
135 event->value.publish.specifics.error.message); 135 event->value.publish.specifics.error.message);
136 err = 1; 136 err = 1;
137 if (0 == strcmp ("list_indexed-context-dir", event->value.publish.cctx)) 137 if (0 == strcmp ("list_indexed-context-dir", event->value.publish.cctx))
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)
139static void 139static void
140do_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 140do_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/");
diff --git a/src/fs/test_fs_publish.c b/src/fs/test_fs_publish.c
index 81ec3dd7f..051b84f68 100644
--- a/src/fs/test_fs_publish.c
+++ b/src/fs/test_fs_publish.c
@@ -118,12 +118,12 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
118 break; 118 break;
119 case GNUNET_FS_STATUS_PUBLISH_ERROR: 119 case GNUNET_FS_STATUS_PUBLISH_ERROR:
120 ret = event->value.publish.cctx; 120 ret = event->value.publish.cctx;
121 fprintf (stderr, "Error publishing file: %s\n", 121 FPRINTF (stderr, "Error publishing file: %s\n",
122 event->value.publish.specifics.error.message); 122 event->value.publish.specifics.error.message);
123 err = 1; 123 err = 1;
124 if (0 == strcmp ("publish-context-dir", event->value.publish.cctx)) 124 if (0 == strcmp ("publish-context-dir", event->value.publish.cctx))
125 { 125 {
126 fprintf (stderr, "Scheduling abort task for error on `%s'\n", 126 FPRINTF (stderr, "Scheduling abort task for error on `%s'\n",
127 (const char *) event->value.publish.cctx); 127 (const char *) event->value.publish.cctx);
128 GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL, 128 GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
129 GNUNET_SCHEDULER_REASON_PREREQ_DONE); 129 GNUNET_SCHEDULER_REASON_PREREQ_DONE);
diff --git a/src/fs/test_fs_publish_persistence.c b/src/fs/test_fs_publish_persistence.c
index 145ef0ca9..4d569849f 100644
--- a/src/fs/test_fs_publish_persistence.c
+++ b/src/fs/test_fs_publish_persistence.c
@@ -184,7 +184,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
184 break; 184 break;
185 case GNUNET_FS_STATUS_PUBLISH_ERROR: 185 case GNUNET_FS_STATUS_PUBLISH_ERROR:
186 ret = event->value.publish.cctx; 186 ret = event->value.publish.cctx;
187 fprintf (stderr, "Error publishing file: %s\n", 187 FPRINTF (stderr, "Error publishing file: %s\n",
188 event->value.publish.specifics.error.message); 188 event->value.publish.specifics.error.message);
189 err = 1; 189 err = 1;
190 GNUNET_SCHEDULER_add_now (&abort_publish_task, NULL); 190 GNUNET_SCHEDULER_add_now (&abort_publish_task, NULL);
diff --git a/src/fs/test_fs_search.c b/src/fs/test_fs_search.c
index 9d9825e2f..ffbcd19de 100644
--- a/src/fs/test_fs_search.c
+++ b/src/fs/test_fs_search.c
@@ -122,14 +122,14 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
122 GNUNET_SCHEDULER_REASON_PREREQ_DONE); 122 GNUNET_SCHEDULER_REASON_PREREQ_DONE);
123 break; 123 break;
124 case GNUNET_FS_STATUS_PUBLISH_ERROR: 124 case GNUNET_FS_STATUS_PUBLISH_ERROR:
125 fprintf (stderr, "Error publishing file: %s\n", 125 FPRINTF (stderr, "Error publishing file: %s\n",
126 event->value.publish.specifics.error.message); 126 event->value.publish.specifics.error.message);
127 GNUNET_break (0); 127 GNUNET_break (0);
128 GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL, 128 GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
129 GNUNET_SCHEDULER_REASON_PREREQ_DONE); 129 GNUNET_SCHEDULER_REASON_PREREQ_DONE);
130 break; 130 break;
131 case GNUNET_FS_STATUS_SEARCH_ERROR: 131 case GNUNET_FS_STATUS_SEARCH_ERROR:
132 fprintf (stderr, "Error searching file: %s\n", 132 FPRINTF (stderr, "Error searching file: %s\n",
133 event->value.search.specifics.error.message); 133 event->value.search.specifics.error.message);
134 GNUNET_SCHEDULER_add_continuation (&abort_search_task, NULL, 134 GNUNET_SCHEDULER_add_continuation (&abort_search_task, NULL,
135 GNUNET_SCHEDULER_REASON_PREREQ_DONE); 135 GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -161,7 +161,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
161 GNUNET_SCHEDULER_REASON_PREREQ_DONE); 161 GNUNET_SCHEDULER_REASON_PREREQ_DONE);
162 break; 162 break;
163 default: 163 default:
164 fprintf (stderr, "Unexpected event: %d\n", event->status); 164 FPRINTF (stderr, "Unexpected event: %d\n", event->status);
165 break; 165 break;
166 } 166 }
167 return NULL; 167 return NULL;
diff --git a/src/fs/test_fs_search_persistence.c b/src/fs/test_fs_search_persistence.c
index 74ba9659a..e511b6910 100644
--- a/src/fs/test_fs_search_persistence.c
+++ b/src/fs/test_fs_search_persistence.c
@@ -170,14 +170,14 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
170 GNUNET_SCHEDULER_REASON_PREREQ_DONE); 170 GNUNET_SCHEDULER_REASON_PREREQ_DONE);
171 break; 171 break;
172 case GNUNET_FS_STATUS_PUBLISH_ERROR: 172 case GNUNET_FS_STATUS_PUBLISH_ERROR:
173 fprintf (stderr, "Error publishing file: %s\n", 173 FPRINTF (stderr, "Error publishing file: %s\n",
174 event->value.publish.specifics.error.message); 174 event->value.publish.specifics.error.message);
175 GNUNET_break (0); 175 GNUNET_break (0);
176 GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL, 176 GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
177 GNUNET_SCHEDULER_REASON_PREREQ_DONE); 177 GNUNET_SCHEDULER_REASON_PREREQ_DONE);
178 break; 178 break;
179 case GNUNET_FS_STATUS_SEARCH_ERROR: 179 case GNUNET_FS_STATUS_SEARCH_ERROR:
180 fprintf (stderr, "Error searching file: %s\n", 180 FPRINTF (stderr, "Error searching file: %s\n",
181 event->value.search.specifics.error.message); 181 event->value.search.specifics.error.message);
182 GNUNET_SCHEDULER_add_continuation (&abort_search_task, NULL, 182 GNUNET_SCHEDULER_add_continuation (&abort_search_task, NULL,
183 GNUNET_SCHEDULER_REASON_PREREQ_DONE); 183 GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -223,7 +223,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
223 search = NULL; 223 search = NULL;
224 break; 224 break;
225 default: 225 default:
226 fprintf (stderr, "Unexpected event: %d\n", event->status); 226 FPRINTF (stderr, "Unexpected event: %d\n", event->status);
227 break; 227 break;
228 } 228 }
229 return NULL; 229 return NULL;
diff --git a/src/fs/test_fs_search_ranking.c b/src/fs/test_fs_search_ranking.c
index 6da936342..383447485 100644
--- a/src/fs/test_fs_search_ranking.c
+++ b/src/fs/test_fs_search_ranking.c
@@ -189,7 +189,7 @@ main (int argc, char *argv[])
189 prog++; 189 prog++;
190 if (prog == 10000) 190 if (prog == 10000)
191 { 191 {
192 fprintf (stderr, "Upload failed to complete -- last event: %u\n", 192 FPRINTF (stderr, "Upload failed to complete -- last event: %u\n",
193 lastEvent); 193 lastEvent);
194 } 194 }
195 CHECK (prog < 10000); 195 CHECK (prog < 10000);
diff --git a/src/fs/test_fs_unindex.c b/src/fs/test_fs_unindex.c
index 9b21cd651..14d93fb5e 100644
--- a/src/fs/test_fs_unindex.c
+++ b/src/fs/test_fs_unindex.c
@@ -135,14 +135,14 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
135#endif 135#endif
136 break; 136 break;
137 case GNUNET_FS_STATUS_PUBLISH_ERROR: 137 case GNUNET_FS_STATUS_PUBLISH_ERROR:
138 fprintf (stderr, "Error publishing file: %s\n", 138 FPRINTF (stderr, "Error publishing file: %s\n",
139 event->value.publish.specifics.error.message); 139 event->value.publish.specifics.error.message);
140 GNUNET_break (0); 140 GNUNET_break (0);
141 GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL, 141 GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
142 GNUNET_SCHEDULER_REASON_PREREQ_DONE); 142 GNUNET_SCHEDULER_REASON_PREREQ_DONE);
143 break; 143 break;
144 case GNUNET_FS_STATUS_UNINDEX_ERROR: 144 case GNUNET_FS_STATUS_UNINDEX_ERROR:
145 fprintf (stderr, "Error unindexing file: %s\n", 145 FPRINTF (stderr, "Error unindexing file: %s\n",
146 event->value.unindex.specifics.error.message); 146 event->value.unindex.specifics.error.message);
147 GNUNET_SCHEDULER_add_continuation (&abort_unindex_task, NULL, 147 GNUNET_SCHEDULER_add_continuation (&abort_unindex_task, NULL,
148 GNUNET_SCHEDULER_REASON_PREREQ_DONE); 148 GNUNET_SCHEDULER_REASON_PREREQ_DONE);
diff --git a/src/fs/test_fs_unindex_persistence.c b/src/fs/test_fs_unindex_persistence.c
index 0529aacfa..e5ad9b260 100644
--- a/src/fs/test_fs_unindex_persistence.c
+++ b/src/fs/test_fs_unindex_persistence.c
@@ -196,14 +196,14 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
196 unindex = event->value.unindex.uc; 196 unindex = event->value.unindex.uc;
197 return "unindex"; 197 return "unindex";
198 case GNUNET_FS_STATUS_PUBLISH_ERROR: 198 case GNUNET_FS_STATUS_PUBLISH_ERROR:
199 fprintf (stderr, "Error publishing file: %s\n", 199 FPRINTF (stderr, "Error publishing file: %s\n",
200 event->value.publish.specifics.error.message); 200 event->value.publish.specifics.error.message);
201 GNUNET_break (0); 201 GNUNET_break (0);
202 GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL, 202 GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
203 GNUNET_SCHEDULER_REASON_PREREQ_DONE); 203 GNUNET_SCHEDULER_REASON_PREREQ_DONE);
204 break; 204 break;
205 case GNUNET_FS_STATUS_UNINDEX_ERROR: 205 case GNUNET_FS_STATUS_UNINDEX_ERROR:
206 fprintf (stderr, "Error unindexing file: %s\n", 206 FPRINTF (stderr, "Error unindexing file: %s\n",
207 event->value.unindex.specifics.error.message); 207 event->value.unindex.specifics.error.message);
208 GNUNET_SCHEDULER_add_continuation (&abort_unindex_task, NULL, 208 GNUNET_SCHEDULER_add_continuation (&abort_unindex_task, NULL,
209 GNUNET_SCHEDULER_REASON_PREREQ_DONE); 209 GNUNET_SCHEDULER_REASON_PREREQ_DONE);
diff --git a/src/fs/test_fs_uri.c b/src/fs/test_fs_uri.c
index 72744351b..b7a58ec0f 100644
--- a/src/fs/test_fs_uri.c
+++ b/src/fs/test_fs_uri.c
@@ -94,7 +94,7 @@ testLocation ()
94 cfg = GNUNET_CONFIGURATION_create (); 94 cfg = GNUNET_CONFIGURATION_create ();
95 if (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, "test_fs_uri_data.conf")) 95 if (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, "test_fs_uri_data.conf"))
96 { 96 {
97 fprintf (stderr, "Failed to parse configuration file\n"); 97 FPRINTF (stderr, "%s", "Failed to parse configuration file\n");
98 GNUNET_FS_uri_destroy (baseURI); 98 GNUNET_FS_uri_destroy (baseURI);
99 GNUNET_CONFIGURATION_destroy (cfg); 99 GNUNET_CONFIGURATION_destroy (cfg);
100 return 1; 100 return 1;
@@ -316,11 +316,11 @@ main (int argc, char *argv[])
316 failureCount += testLocation (); 316 failureCount += testLocation ();
317 for (i = 0; i < 255; i++) 317 for (i = 0; i < 255; i++)
318 { 318 {
319 /* fprintf (stderr, "."); */ 319 /* FPRINTF (stderr, "%s", "."); */
320 failureCount += testNamespace (i); 320 failureCount += testNamespace (i);
321 failureCount += testFile (i); 321 failureCount += testFile (i);
322 } 322 }
323 /* fprintf (stderr, "\n"); */ 323 /* FPRINTF (stderr, "%s", "\n"); */
324 GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-uri"); 324 GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-uri");
325 if (failureCount != 0) 325 if (failureCount != 0)
326 return 1; 326 return 1;
diff --git a/src/fs/test_gnunet_service_fs_migration.c b/src/fs/test_gnunet_service_fs_migration.c
index 91caf103f..70fadd8d0 100644
--- a/src/fs/test_gnunet_service_fs_migration.c
+++ b/src/fs/test_gnunet_service_fs_migration.c
@@ -74,7 +74,7 @@ do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
74 fancy = 74 fancy =
75 GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) * 75 GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) *
76 1000LL / del.rel_value); 76 1000LL / del.rel_value);
77 fprintf (stdout, "Download speed was %s/s\n", fancy); 77 FPRINTF (stdout, "Download speed was %s/s\n", fancy);
78 GNUNET_free (fancy); 78 GNUNET_free (fancy);
79 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Finished download, shutting down\n", 79 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Finished download, shutting down\n",
80 (unsigned long long) FILESIZE); 80 (unsigned long long) FILESIZE);
@@ -166,7 +166,7 @@ do_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
166{ 166{
167 if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE)) 167 if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
168 { 168 {
169 fprintf (stderr, "Daemons failed to start!\n"); 169 FPRINTF (stderr, "%s", "Daemons failed to start!\n");
170 GNUNET_break (0); 170 GNUNET_break (0);
171 ok = 1; 171 ok = 1;
172 return; 172 return;
diff --git a/src/fs/test_gnunet_service_fs_p2p.c b/src/fs/test_gnunet_service_fs_p2p.c
index 434dd3ce5..fb07d34b5 100644
--- a/src/fs/test_gnunet_service_fs_p2p.c
+++ b/src/fs/test_gnunet_service_fs_p2p.c
@@ -70,7 +70,7 @@ do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
70 fancy = 70 fancy =
71 GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) * 71 GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) *
72 1000LL / del.rel_value); 72 1000LL / del.rel_value);
73 fprintf (stdout, "Download speed was %s/s\n", fancy); 73 FPRINTF (stdout, "Download speed was %s/s\n", fancy);
74 GNUNET_free (fancy); 74 GNUNET_free (fancy);
75 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Finished download, shutting down\n", 75 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Finished download, shutting down\n",
76 (unsigned long long) FILESIZE); 76 (unsigned long long) FILESIZE);