summaryrefslogtreecommitdiff
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,
if (NULL == args[0])
{
- fprintf (stderr, _("You must specify a filename to inspect."));
+ FPRINTF (stderr, "%s", _("You must specify a filename to inspect."));
ret = 1;
return;
}
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)
{
case GNUNET_FS_STATUS_DOWNLOAD_START:
if (verbose > 1)
- fprintf (stderr, _("Starting download `%s'.\n"),
+ FPRINTF (stderr, _("Starting download `%s'.\n"),
info->value.download.filename);
break;
case GNUNET_FS_STATUS_DOWNLOAD_PROGRESS:
@@ -108,7 +108,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
1000LL /
(info->value.download.
duration.rel_value + 1));
- fprintf (stdout,
+ FPRINTF (stdout,
_("Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"),
info->value.download.filename,
(unsigned long long) info->value.download.completed,
@@ -118,7 +118,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
}
break;
case GNUNET_FS_STATUS_DOWNLOAD_ERROR:
- fprintf (stderr, _("Error downloading: %s.\n"),
+ FPRINTF (stderr, _("Error downloading: %s.\n"),
info->value.download.specifics.error.message);
GNUNET_SCHEDULER_shutdown ();
break;
@@ -126,7 +126,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
s = GNUNET_STRINGS_byte_size_fancy (info->value.download.completed * 1000 /
(info->value.download.
duration.rel_value + 1));
- fprintf (stdout, _("Downloading `%s' done (%s/s).\n"),
+ FPRINTF (stdout, _("Downloading `%s' done (%s/s).\n"),
info->value.download.filename, s);
GNUNET_free (s);
if (info->value.download.dc == dc)
@@ -141,7 +141,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
case GNUNET_FS_STATUS_DOWNLOAD_INACTIVE:
break;
default:
- fprintf (stderr, _("Unexpected status: %d\n"), info->status);
+ FPRINTF (stderr, _("Unexpected status: %d\n"), info->status);
break;
}
return NULL;
@@ -166,27 +166,27 @@ run (void *cls, char *const *args, const char *cfgfile,
if (NULL == args[0])
{
- fprintf (stderr, _("You need to specify a URI argument.\n"));
+ FPRINTF (stderr, "%s", _("You need to specify a URI argument.\n"));
return;
}
uri = GNUNET_FS_uri_parse (args[0], &emsg);
if (NULL == uri)
{
- fprintf (stderr, _("Failed to parse URI: %s\n"), emsg);
+ FPRINTF (stderr, _("Failed to parse URI: %s\n"), emsg);
GNUNET_free (emsg);
ret = 1;
return;
}
if ((!GNUNET_FS_uri_test_chk (uri)) && (!GNUNET_FS_uri_test_loc (uri)))
{
- fprintf (stderr, _("Only CHK or LOC URIs supported.\n"));
+ FPRINTF (stderr, "%s", _("Only CHK or LOC URIs supported.\n"));
ret = 1;
GNUNET_FS_uri_destroy (uri);
return;
}
if (NULL == filename)
{
- fprintf (stderr, _("Target filename must be specified.\n"));
+ FPRINTF (stderr, "%s", _("Target filename must be specified.\n"));
ret = 1;
GNUNET_FS_uri_destroy (uri);
return;
@@ -200,7 +200,7 @@ run (void *cls, char *const *args, const char *cfgfile,
request_parallelism, GNUNET_FS_OPTIONS_END);
if (NULL == ctx)
{
- fprintf (stderr, _("Could not initialize `%s' subsystem.\n"), "FS");
+ FPRINTF (stderr, _("Could not initialize `%s' subsystem.\n"), "FS");
GNUNET_FS_uri_destroy (uri);
ret = 1;
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
print_indexed (void *cls, const char *filename, const GNUNET_HashCode * file_id)
{
if (verbose)
- fprintf (stdout, "%s: %s\n", GNUNET_h2s (file_id), filename);
+ FPRINTF (stdout, "%s: %s\n", GNUNET_h2s (file_id), filename);
else
- fprintf (stdout, "%s\n", filename);
+ FPRINTF (stdout, "%s\n", filename);
return GNUNET_OK;
}
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)
struct GNUNET_CRYPTO_HashAsciiEncoded enc;
GNUNET_CRYPTO_hash_to_enc (id, &enc);
- fprintf (stdout, "%s (%s)\n", name, (const char *) &enc);
+ FPRINTF (stdout, "%s (%s)\n", name, (const char *) &enc);
}
@@ -116,9 +116,9 @@ pseudo_printer (void *cls, const GNUNET_HashCode * pseudonym,
GNUNET_break (0);
return GNUNET_OK;
}
- fprintf (stdout, "%s (%d):\n", id, rating);
+ FPRINTF (stdout, "%s (%d):\n", id, rating);
GNUNET_CONTAINER_meta_data_iterate (md, &EXTRACTOR_meta_data_print, stdout);
- fprintf (stdout, "\n");
+ FPRINTF (stdout, "%s", "\n");
GNUNET_free (id);
return GNUNET_OK;
}
@@ -133,7 +133,7 @@ post_advertising (void *cls, const struct GNUNET_FS_Uri *uri, const char *emsg)
if (emsg != NULL)
{
- fprintf (stderr, "%s", emsg);
+ FPRINTF (stderr, "%s", emsg);
ret = 1;
}
if (ns != NULL)
@@ -237,16 +237,16 @@ run (void *cls, char *const *args, const char *cfgfile,
else
{
if (ksk_uri != NULL)
- fprintf (stderr, _("Option `%s' ignored\n"), "-k");
+ FPRINTF (stderr, _("Option `%s' ignored\n"), "-k");
}
}
}
else
{
if (root_identifier != NULL)
- fprintf (stderr, _("Option `%s' ignored\n"), "-r");
+ FPRINTF (stderr, _("Option `%s' ignored\n"), "-r");
if (ksk_uri != NULL)
- fprintf (stderr, _("Option `%s' ignored\n"), "-k");
+ FPRINTF (stderr, _("Option `%s' ignored\n"), "-k");
}
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)
if (verbose)
{
s = GNUNET_STRINGS_relative_time_to_string (info->value.publish.eta);
- fprintf (stdout, _("Publishing `%s' at %llu/%llu (%s remaining)\n"),
+ FPRINTF (stdout, _("Publishing `%s' at %llu/%llu (%s remaining)\n"),
info->value.publish.filename,
(unsigned long long) info->value.publish.completed,
(unsigned long long) info->value.publish.size, s);
@@ -123,7 +123,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
}
break;
case GNUNET_FS_STATUS_PUBLISH_ERROR:
- fprintf (stderr, _("Error publishing: %s.\n"),
+ FPRINTF (stderr, _("Error publishing: %s.\n"),
info->value.publish.specifics.error.message);
if (kill_task != GNUNET_SCHEDULER_NO_TASK)
{
@@ -134,11 +134,11 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
break;
case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
- fprintf (stdout, _("Publishing `%s' done.\n"),
+ FPRINTF (stdout, _("Publishing `%s' done.\n"),
info->value.publish.filename);
s = GNUNET_FS_uri_to_string (info->value.publish.specifics.
completed.chk_uri);
- fprintf (stdout, _("URI is `%s'.\n"), s);
+ FPRINTF (stdout, _("URI is `%s'.\n"), s);
GNUNET_free (s);
if (info->value.publish.pctx == NULL)
{
@@ -157,10 +157,10 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
case GNUNET_FS_STATUS_UNINDEX_PROGRESS:
return NULL;
case GNUNET_FS_STATUS_UNINDEX_COMPLETED:
- fprintf (stderr, _("Cleanup after abort complete.\n"));
+ FPRINTF (stderr, "%s", _("Cleanup after abort complete.\n"));
return NULL;
default:
- fprintf (stderr, _("Unexpected status: %d\n"), info->status);
+ FPRINTF (stderr, _("Unexpected status: %d\n"), info->status);
return NULL;
}
return ""; /* non-null */
@@ -190,7 +190,7 @@ meta_printer (void *cls, const char *plugin_name, enum EXTRACTOR_MetaType type,
return 0;
if (type == EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME)
return 0;
- fprintf (stdout, "\t%s - %s\n", EXTRACTOR_metatype_to_string (type), data);
+ FPRINTF (stdout, "\t%s - %s\n", EXTRACTOR_metatype_to_string (type), data);
return 0;
}
@@ -206,7 +206,7 @@ meta_printer (void *cls, const char *plugin_name, enum EXTRACTOR_MetaType type,
static int
keyword_printer (void *cls, const char *keyword, int is_mandatory)
{
- fprintf (stdout, "\t%s\n", keyword);
+ FPRINTF (stdout, "\t%s\n", keyword);
return GNUNET_OK;
}
@@ -269,14 +269,14 @@ publish_inspector (void *cls, struct GNUNET_FS_FileInformation *fi,
fn = GNUNET_CONTAINER_meta_data_get_by_type (m,
EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME);
fs = GNUNET_STRINGS_byte_size_fancy (length);
- fprintf (stdout, _("Meta data for file `%s' (%s)\n"), fn, fs);
+ FPRINTF (stdout, _("Meta data for file `%s' (%s)\n"), fn, fs);
GNUNET_CONTAINER_meta_data_iterate (m, &meta_printer, NULL);
- fprintf (stdout, _("Keywords for file `%s' (%s)\n"), fn, fs);
+ FPRINTF (stdout, _("Keywords for file `%s' (%s)\n"), fn, fs);
GNUNET_free (fn);
GNUNET_free (fs);
if (NULL != *uri)
GNUNET_FS_uri_ksk_get_keywords (*uri, &keyword_printer, NULL);
- fprintf (stdout, "\n");
+ FPRINTF (stdout, "%s", "\n");
}
if (GNUNET_YES == GNUNET_FS_meta_data_test_for_directory (m))
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,
{
if (emsg != NULL)
{
- fprintf (stderr, "%s\n", emsg);
+ FPRINTF (stderr, "%s\n", emsg);
ret = 1;
}
GNUNET_FS_uri_destroy (uri);
@@ -314,7 +314,7 @@ uri_ksk_continuation (void *cls, const struct GNUNET_FS_Uri *ksk_uri,
if (emsg != NULL)
{
- fprintf (stderr, "%s\n", emsg);
+ FPRINTF (stderr, "%s\n", emsg);
ret = 1;
}
if (pseudonym != NULL)
@@ -322,7 +322,7 @@ uri_ksk_continuation (void *cls, const struct GNUNET_FS_Uri *ksk_uri,
ns = GNUNET_FS_namespace_create (ctx, pseudonym);
if (ns == NULL)
{
- fprintf (stderr, _("Failed to create namespace `%s'\n"), pseudonym);
+ FPRINTF (stderr, _("Failed to create namespace `%s'\n"), pseudonym);
ret = 1;
}
else
@@ -385,7 +385,7 @@ run (void *cls, char *const *args, const char *cfgfile,
{
if (NULL == this_id)
{
- fprintf (stderr, _("Option `%s' is required when using option `%s'.\n"),
+ FPRINTF (stderr, _("Option `%s' is required when using option `%s'.\n"),
"-t", "-P");
ret = -1;
return;
@@ -395,14 +395,14 @@ run (void *cls, char *const *args, const char *cfgfile,
{ /* ordinary insertion checks */
if (NULL != next_id)
{
- fprintf (stderr, _("Option `%s' makes no sense without option `%s'.\n"),
+ FPRINTF (stderr, _("Option `%s' makes no sense without option `%s'.\n"),
"-N", "-P");
ret = -1;
return;
}
if (NULL != this_id)
{
- fprintf (stderr, _("Option `%s' makes no sense without option `%s'.\n"),
+ FPRINTF (stderr, _("Option `%s' makes no sense without option `%s'.\n"),
"-t", "-P");
ret = -1;
return;
@@ -414,7 +414,7 @@ run (void *cls, char *const *args, const char *cfgfile,
GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END);
if (NULL == ctx)
{
- fprintf (stderr, _("Could not initialize `%s' subsystem.\n"), "FS");
+ FPRINTF (stderr, _("Could not initialize `%s' subsystem.\n"), "FS");
ret = 1;
return;
}
@@ -424,7 +424,7 @@ run (void *cls, char *const *args, const char *cfgfile,
namespace = GNUNET_FS_namespace_create (ctx, pseudonym);
if (NULL == namespace)
{
- fprintf (stderr, _("Could not create namespace `%s'\n"), pseudonym);
+ FPRINTF (stderr, _("Could not create namespace `%s'\n"), pseudonym);
GNUNET_FS_stop (ctx);
ret = 1;
return;
@@ -436,7 +436,7 @@ run (void *cls, char *const *args, const char *cfgfile,
uri = GNUNET_FS_uri_parse (uri_string, &emsg);
if (uri == NULL)
{
- fprintf (stderr, _("Failed to parse URI: %s\n"), emsg);
+ FPRINTF (stderr, _("Failed to parse URI: %s\n"), emsg);
GNUNET_free (emsg);
if (namespace != NULL)
GNUNET_FS_namespace_delete (namespace, GNUNET_NO);
@@ -494,7 +494,7 @@ run (void *cls, char *const *args, const char *cfgfile,
EXTRACTOR_plugin_remove_all (plugins);
if (fi == NULL)
{
- fprintf (stderr, _("Could not publish `%s': %s\n"), args[0], emsg);
+ FPRINTF (stderr, _("Could not publish `%s': %s\n"), args[0], emsg);
GNUNET_free (emsg);
if (namespace != NULL)
GNUNET_FS_namespace_delete (namespace, GNUNET_NO);
@@ -517,7 +517,7 @@ run (void *cls, char *const *args, const char *cfgfile,
GNUNET_FS_PUBLISH_OPTION_NONE);
if (NULL == pc)
{
- fprintf (stderr, _("Could not start publishing.\n"));
+ FPRINTF (stderr, "%s", _("Could not start publishing.\n"));
GNUNET_FS_stop (ctx);
ret = 1;
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)
GNUNET_DISK_PERM_USER_READ |
GNUNET_DISK_PERM_USER_WRITE))
{
- fprintf (stderr,
+ FPRINTF (stderr,
_("Failed to write directory with search results to `%s'\n"),
output_filename);
}
@@ -178,7 +178,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
/* ignore */
break;
case GNUNET_FS_STATUS_SEARCH_ERROR:
- fprintf (stderr, _("Error searching: %s.\n"),
+ FPRINTF (stderr, _("Error searching: %s.\n"),
info->value.search.specifics.error.message);
GNUNET_SCHEDULER_shutdown ();
break;
@@ -187,7 +187,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
break;
default:
- fprintf (stderr, _("Unexpected status: %d\n"), info->status);
+ FPRINTF (stderr, _("Unexpected status: %d\n"), info->status);
break;
}
return NULL;
@@ -228,7 +228,7 @@ run (void *cls, char *const *args, const char *cfgfile,
uri = GNUNET_FS_uri_ksk_create_from_args (argc, (const char **) args);
if (NULL == uri)
{
- fprintf (stderr, _("Could not create keyword URI from arguments.\n"));
+ FPRINTF (stderr, "%s", _("Could not create keyword URI from arguments.\n"));
ret = 1;
return;
}
@@ -238,7 +238,7 @@ run (void *cls, char *const *args, const char *cfgfile,
GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END);
if (NULL == ctx)
{
- fprintf (stderr, _("Could not initialize `%s' subsystem.\n"), "FS");
+ FPRINTF (stderr, _("Could not initialize `%s' subsystem.\n"), "FS");
GNUNET_FS_uri_destroy (uri);
ret = 1;
return;
@@ -252,7 +252,7 @@ run (void *cls, char *const *args, const char *cfgfile,
GNUNET_FS_uri_destroy (uri);
if (NULL == sc)
{
- fprintf (stderr, _("Could not start searching.\n"));
+ FPRINTF (stderr, "%s", _("Could not start searching.\n"));
GNUNET_FS_stop (ctx);
ret = 1;
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)
if (verbose)
{
s = GNUNET_STRINGS_relative_time_to_string (info->value.unindex.eta);
- fprintf (stdout, _("Unindexing at %llu/%llu (%s remaining)\n"),
+ FPRINTF (stdout, _("Unindexing at %llu/%llu (%s remaining)\n"),
(unsigned long long) info->value.unindex.completed,
(unsigned long long) info->value.unindex.size, s);
GNUNET_free (s);
}
break;
case GNUNET_FS_STATUS_UNINDEX_ERROR:
- fprintf (stderr, _("Error unindexing: %s.\n"),
+ FPRINTF (stderr, _("Error unindexing: %s.\n"),
info->value.unindex.specifics.error.message);
GNUNET_SCHEDULER_shutdown ();
break;
case GNUNET_FS_STATUS_UNINDEX_COMPLETED:
- fprintf (stdout, _("Unindexing done.\n"));
+ FPRINTF (stdout, "%s", _("Unindexing done.\n"));
GNUNET_SCHEDULER_shutdown ();
break;
case GNUNET_FS_STATUS_UNINDEX_STOPPED:
@@ -106,7 +106,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
break;
default:
- fprintf (stderr, _("Unexpected status: %d\n"), info->status);
+ FPRINTF (stderr, _("Unexpected status: %d\n"), info->status);
break;
}
return NULL;
@@ -138,14 +138,14 @@ run (void *cls, char *const *args, const char *cfgfile,
GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END);
if (NULL == ctx)
{
- fprintf (stderr, _("Could not initialize `%s' subsystem.\n"), "FS");
+ FPRINTF (stderr, _("Could not initialize `%s' subsystem.\n"), "FS");
ret = 1;
return;
}
uc = GNUNET_FS_unindex_start (ctx, args[0], NULL);
if (NULL == uc)
{
- fprintf (stderr, _("Could not start unindex operation.\n"));
+ FPRINTF (stderr, "%s", _("Could not start unindex operation.\n"));
GNUNET_FS_stop (ctx);
return;
}
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,
{
struct StatMaster *sm = cls;
- fprintf (stderr, "Peer %2u: %12s/%50s = %12llu\n", sm->daemon, subsystem,
+ FPRINTF (stderr, "Peer %2u: %12s/%50s = %12llu\n", sm->daemon, subsystem,
name, (unsigned long long) value);
return GNUNET_OK;
}
@@ -199,7 +199,7 @@ do_report (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
fancy =
GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) *
1000LL / del.rel_value);
- fprintf (stdout, "Download speed was %s/s\n", fancy);
+ FPRINTF (stdout, "Download speed was %s/s\n", fancy);
GNUNET_free (fancy);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Finished download, shutting down\n",
(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,
{
struct StatMaster *sm = cls;
- fprintf (stderr, "Peer %2u: %12s/%50s = %12llu\n", sm->daemon, subsystem,
+ FPRINTF (stderr, "Peer %2u: %12s/%50s = %12llu\n", sm->daemon, subsystem,
name, (unsigned long long) value);
return GNUNET_OK;
}
@@ -234,7 +234,7 @@ do_report (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
fancy =
GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) *
1000LL / del.rel_value);
- fprintf (stderr, "Download speed of type `%s' was %s/s\n", type, fancy);
+ FPRINTF (stderr, "Download speed of type `%s' was %s/s\n", type, fancy);
GNUNET_free (fancy);
if (NUM_DAEMONS != ++download_counter)
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,
return;
}
}
- fprintf (stderr, "Error at %s:%d\n", __FILE__, __LINE__);
+ FPRINTF (stderr, "Error at %s:%d\n", __FILE__, __LINE__);
}
static int
@@ -131,7 +131,7 @@ testDirectory (unsigned int i)
GNUNET_FS_directory_builder_finish (db, &dlen, (void **) &data);
s = GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_duration
(start));
- fprintf (stdout,
+ FPRINTF (stdout,
"Creating directory with %u entires and total size %llu took %s\n",
i, (unsigned long long) dlen, s);
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)
#endif
break;
case GNUNET_FS_STATUS_PUBLISH_ERROR:
- fprintf (stderr, "Error publishing file: %s\n",
+ FPRINTF (stderr, "Error publishing file: %s\n",
event->value.publish.specifics.error.message);
GNUNET_break (0);
GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
break;
case GNUNET_FS_STATUS_DOWNLOAD_ERROR:
- fprintf (stderr, "Error downloading file: %s\n",
+ FPRINTF (stderr, "Error downloading file: %s\n",
event->value.download.specifics.error.message);
GNUNET_SCHEDULER_add_now (&abort_download_task, NULL);
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)
#endif
break;
case GNUNET_FS_STATUS_PUBLISH_ERROR:
- fprintf (stderr, "Error publishing file: %s\n",
+ FPRINTF (stderr, "Error publishing file: %s\n",
event->value.publish.specifics.error.message);
GNUNET_break (0);
GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
break;
case GNUNET_FS_STATUS_DOWNLOAD_ERROR:
- fprintf (stderr, "Error downloading file: %s\n",
+ FPRINTF (stderr, "Error downloading file: %s\n",
event->value.download.specifics.error.message);
GNUNET_SCHEDULER_add_now (&abort_download_task, NULL);
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)
#endif
break;
case GNUNET_FS_STATUS_PUBLISH_ERROR:
- fprintf (stderr, "Error publishing file: %s\n",
+ FPRINTF (stderr, "Error publishing file: %s\n",
event->value.publish.specifics.error.message);
GNUNET_break (0);
GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
break;
case GNUNET_FS_STATUS_DOWNLOAD_ERROR:
- fprintf (stderr, "Error downloading file: %s\n",
+ FPRINTF (stderr, "Error downloading file: %s\n",
event->value.download.specifics.error.message);
GNUNET_SCHEDULER_add_now (&abort_download_task, NULL);
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)
#endif
break;
case GNUNET_FSUI_unindex_error:
- fprintf (stderr, "Error unindexing: %s\n",
+ FPRINTF (stderr, "Error unindexing: %s\n",
event->data.UnindexError.message);
break;
case GNUNET_FSUI_upload_error:
- fprintf (stderr, "Error uploading: %s\n", event->data.UploadError.message);
+ FPRINTF (stderr, "Error uploading: %s\n", event->data.UploadError.message);
break;
case GNUNET_FSUI_download_error:
- fprintf (stderr, "Error downloading: %s\n",
+ FPRINTF (stderr, "Error downloading: %s\n",
event->data.DownloadError.message);
break;
case GNUNET_FSUI_download_aborted:
@@ -277,7 +277,7 @@ main (int argc, char *argv[])
GNUNET_GC_free (cfg);
return -1;
}
- fprintf (stderr, "Setup...\n");
+ FPRINTF (stderr, "%s", "Setup...\n");
#if START_DAEMON
GNUNET_disk_directory_remove (NULL,
"/tmp/gnunet-fsui-recursive_download_test/");
@@ -297,7 +297,7 @@ main (int argc, char *argv[])
kuri =
GNUNET_ECRS_keyword_command_line_to_uri (ectx, 2,
(const char **) keywords);
- fprintf (stderr, "Uploading...\n");
+ FPRINTF (stderr, "%s", "Uploading...\n");
waitForEvent = GNUNET_FSUI_upload_completed;
upload =
GNUNET_FSUI_upload_start (ctx, fn,
@@ -322,7 +322,7 @@ main (int argc, char *argv[])
upload = NULL;
CHECK (upURI != NULL);
- fprintf (stderr, "Downloading...\n");
+ FPRINTF (stderr, "%s", "Downloading...\n");
waitForEvent = GNUNET_FSUI_download_completed;
fn43 = makeName (43);
download =
@@ -341,7 +341,7 @@ main (int argc, char *argv[])
break;
}
FAILURE:
- fprintf (stderr, "Cleanup...\n");
+ FPRINTF (stderr, "%s", "Cleanup...\n");
if (meta != NULL)
GNUNET_meta_data_destroy (meta);
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 ()
EXTRACTOR_OPTION_DEFAULT_POLICY);
if (ex == NULL)
{
- fprintf (stderr,
- "Test incomplete, have no GTK thumbnail extractor available.\n");
+ FPRINTF (stderr,
+ "Test incomplete, have no GTK thumbnail extractor available.\n", NULL);
return 0; /* can not test, no thumbnailer */
}
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[])
"WARNING",
#endif
NULL);
- fprintf (stderr, "WARNING: testcase not yet written.\n");
+ FPRINTF (stderr, "%s", "WARNING: testcase not yet written.\n");
return 0; /* testcase passed */
}
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)
break;
case GNUNET_FS_STATUS_PUBLISH_ERROR:
ret = event->value.publish.cctx;
- fprintf (stderr, "Error publishing file: %s\n",
+ FPRINTF (stderr, "Error publishing file: %s\n",
event->value.publish.specifics.error.message);
err = 1;
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)
static void
do_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- fprintf (stderr, "Operation timed out\n");
+ FPRINTF (stderr, "%s", "Operation timed out\n");
kill_task = GNUNET_SCHEDULER_NO_TASK;
abort_sks_search_task (NULL, tc);
abort_ksk_search_task (NULL, tc);
@@ -158,7 +158,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
if (!GNUNET_FS_uri_test_equal
(sks_expect_uri, event->value.search.specifics.result.uri))
{
- fprintf (stderr, "Wrong result for sks search!\n");
+ FPRINTF (stderr, "%s", "Wrong result for sks search!\n");
err = 1;
}
/* give system 1ms to initiate update search! */
@@ -170,7 +170,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
if (!GNUNET_FS_uri_test_equal
(ksk_expect_uri, event->value.search.specifics.result.uri))
{
- fprintf (stderr, "Wrong result for ksk search!\n");
+ FPRINTF (stderr, "%s", "Wrong result for ksk search!\n");
err = 1;
}
GNUNET_SCHEDULER_add_continuation (&abort_ksk_search_task, NULL,
@@ -178,12 +178,12 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
}
else
{
- fprintf (stderr, "Unexpected search result received!\n");
+ FPRINTF (stderr, "%s", "Unexpected search result received!\n");
GNUNET_break (0);
}
break;
case GNUNET_FS_STATUS_SEARCH_ERROR:
- fprintf (stderr, "Error searching file: %s\n",
+ FPRINTF (stderr, "Error searching file: %s\n",
event->value.search.specifics.error.message);
if (sks_search == event->value.search.sc)
GNUNET_SCHEDULER_add_continuation (&abort_sks_search_task, NULL,
@@ -210,7 +210,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
case GNUNET_FS_STATUS_SEARCH_STOPPED:
return NULL;
default:
- fprintf (stderr, "Unexpected event: %d\n", event->status);
+ FPRINTF (stderr, "Unexpected event: %d\n", event->status);
break;
}
return event->value.search.cctx;
@@ -227,7 +227,7 @@ publish_cont (void *cls, const struct GNUNET_FS_Uri *ksk_uri, const char *emsg)
if (NULL != emsg)
{
- fprintf (stderr, "Error publishing: %s\n", emsg);
+ FPRINTF (stderr, "Error publishing: %s\n", emsg);
err = 1;
GNUNET_FS_stop (fs);
return;
@@ -237,7 +237,7 @@ publish_cont (void *cls, const struct GNUNET_FS_Uri *ksk_uri, const char *emsg)
sks_uri = GNUNET_FS_uri_parse (sbuf, &msg);
if (msg != NULL)
{
- fprintf (stderr, "failed to parse URI `%s': %s\n", sbuf, msg);
+ FPRINTF (stderr, "failed to parse URI `%s': %s\n", sbuf, msg);
err = 1;
GNUNET_FS_stop (fs);
GNUNET_free (msg);
@@ -287,7 +287,7 @@ adv_cont (void *cls, const struct GNUNET_FS_Uri *uri, const char *emsg)
if (NULL != emsg)
{
- fprintf (stderr, "Error publishing: %s\n", emsg);
+ FPRINTF (stderr, "Error publishing: %s\n", emsg);
err = 1;
GNUNET_FS_stop (fs);
return;
@@ -336,7 +336,7 @@ testNamespace ()
GNUNET_FS_namespace_list (fs, &ns_iterator, &ok);
if (GNUNET_NO == ok)
{
- fprintf (stderr, "namespace_list failed to find namespace!\n");
+ FPRINTF (stderr, "%s", "namespace_list failed to find namespace!\n");
GNUNET_FS_namespace_delete (ns, GNUNET_YES);
GNUNET_FS_stop (fs);
err = 1;
@@ -399,7 +399,7 @@ main (int argc, char *argv[])
stop_arm (&p1);
if (GNUNET_YES != update_started)
{
- fprintf (stderr, "Update search never started!\n");
+ FPRINTF (stderr, "%s", "Update search never started!\n");
err = 1;
}
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)
break;
case GNUNET_FS_STATUS_PUBLISH_ERROR:
ret = event->value.publish.cctx;
- fprintf (stderr, "Error publishing file: %s\n",
+ FPRINTF (stderr, "Error publishing file: %s\n",
event->value.publish.specifics.error.message);
err = 1;
if (0 == strcmp ("publish-context-dir", event->value.publish.cctx))
{
- fprintf (stderr, "Scheduling abort task for error on `%s'\n",
+ FPRINTF (stderr, "Scheduling abort task for error on `%s'\n",
(const char *) event->value.publish.cctx);
GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
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)
break;
case GNUNET_FS_STATUS_PUBLISH_ERROR:
ret = event->value.publish.cctx;
- fprintf (stderr, "Error publishing file: %s\n",
+ FPRINTF (stderr, "Error publishing file: %s\n",
event->value.publish.specifics.error.message);
err = 1;
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)
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
break;
case GNUNET_FS_STATUS_PUBLISH_ERROR:
- fprintf (stderr, "Error publishing file: %s\n",
+ FPRINTF (stderr, "Error publishing file: %s\n",
event->value.publish.specifics.error.message);
GNUNET_break (0);
GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
break;
case GNUNET_FS_STATUS_SEARCH_ERROR:
- fprintf (stderr, "Error searching file: %s\n",
+ FPRINTF (stderr, "Error searching file: %s\n",
event->value.search.specifics.error.message);
GNUNET_SCHEDULER_add_continuation (&abort_search_task, NULL,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -161,7 +161,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
break;
default:
- fprintf (stderr, "Unexpected event: %d\n", event->status);
+ FPRINTF (stderr, "Unexpected event: %d\n", event->status);
break;
}
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)
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
break;
case GNUNET_FS_STATUS_PUBLISH_ERROR:
- fprintf (stderr, "Error publishing file: %s\n",
+ FPRINTF (stderr, "Error publishing file: %s\n",
event->value.publish.specifics.error.message);
GNUNET_break (0);
GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
break;
case GNUNET_FS_STATUS_SEARCH_ERROR:
- fprintf (stderr, "Error searching file: %s\n",
+ FPRINTF (stderr, "Error searching file: %s\n",
event->value.search.specifics.error.message);
GNUNET_SCHEDULER_add_continuation (&abort_search_task, NULL,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -223,7 +223,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
search = NULL;
break;
default:
- fprintf (stderr, "Unexpected event: %d\n", event->status);
+ FPRINTF (stderr, "Unexpected event: %d\n", event->status);
break;
}
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[])
prog++;
if (prog == 10000)
{
- fprintf (stderr, "Upload failed to complete -- last event: %u\n",
+ FPRINTF (stderr, "Upload failed to complete -- last event: %u\n",
lastEvent);
}
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)
#endif
break;
case GNUNET_FS_STATUS_PUBLISH_ERROR:
- fprintf (stderr, "Error publishing file: %s\n",
+ FPRINTF (stderr, "Error publishing file: %s\n",
event->value.publish.specifics.error.message);
GNUNET_break (0);
GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
break;
case GNUNET_FS_STATUS_UNINDEX_ERROR:
- fprintf (stderr, "Error unindexing file: %s\n",
+ FPRINTF (stderr, "Error unindexing file: %s\n",
event->value.unindex.specifics.error.message);
GNUNET_SCHEDULER_add_continuation (&abort_unindex_task, NULL,
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)
unindex = event->value.unindex.uc;
return "unindex";
case GNUNET_FS_STATUS_PUBLISH_ERROR:
- fprintf (stderr, "Error publishing file: %s\n",
+ FPRINTF (stderr, "Error publishing file: %s\n",
event->value.publish.specifics.error.message);
GNUNET_break (0);
GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
break;
case GNUNET_FS_STATUS_UNINDEX_ERROR:
- fprintf (stderr, "Error unindexing file: %s\n",
+ FPRINTF (stderr, "Error unindexing file: %s\n",
event->value.unindex.specifics.error.message);
GNUNET_SCHEDULER_add_continuation (&abort_unindex_task, NULL,
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 ()
cfg = GNUNET_CONFIGURATION_create ();
if (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, "test_fs_uri_data.conf"))
{
- fprintf (stderr, "Failed to parse configuration file\n");
+ FPRINTF (stderr, "%s", "Failed to parse configuration file\n");
GNUNET_FS_uri_destroy (baseURI);
GNUNET_CONFIGURATION_destroy (cfg);
return 1;
@@ -316,11 +316,11 @@ main (int argc, char *argv[])
failureCount += testLocation ();
for (i = 0; i < 255; i++)
{
- /* fprintf (stderr, "."); */
+ /* FPRINTF (stderr, "%s", "."); */
failureCount += testNamespace (i);
failureCount += testFile (i);
}
- /* fprintf (stderr, "\n"); */
+ /* FPRINTF (stderr, "%s", "\n"); */
GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-uri");
if (failureCount != 0)
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)
fancy =
GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) *
1000LL / del.rel_value);
- fprintf (stdout, "Download speed was %s/s\n", fancy);
+ FPRINTF (stdout, "Download speed was %s/s\n", fancy);
GNUNET_free (fancy);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Finished download, shutting down\n",
(unsigned long long) FILESIZE);
@@ -166,7 +166,7 @@ do_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
{
- fprintf (stderr, "Daemons failed to start!\n");
+ FPRINTF (stderr, "%s", "Daemons failed to start!\n");
GNUNET_break (0);
ok = 1;
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)
fancy =
GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) *
1000LL / del.rel_value);
- fprintf (stdout, "Download speed was %s/s\n", fancy);
+ FPRINTF (stdout, "Download speed was %s/s\n", fancy);
GNUNET_free (fancy);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Finished download, shutting down\n",
(unsigned long long) FILESIZE);