-LRN: use FPRINTF -- #2051

5 files changed, 29 insertions, 29 deletions

diff --git a/src/datastore/perf_datastore_api.c b/src/datastore/perf_datastore_api.c
index 372a61f7d..106d40684 100644
--- a/src/datastore/perf_datastore_api.c
+++ b/src/datastore/perf_datastore_api.c
@@ -123,7 +123,7 @@ check_success (void *cls, int success, struct GNUNET_TIME_Absolute min_expiratio
     return;
   }
 #if REPORT_ID
-  fprintf (stderr, "I");
+  FPRINTF (stderr, "%s",  "I");
 #endif
   stored_bytes += crc->size;
   stored_ops++;
@@ -166,7 +166,7 @@ remove_next (void *cls, int success, struct GNUNET_TIME_Absolute min_expiration,
     return;
   }
 #if REPORT_ID
-  fprintf (stderr, "D");
+  FPRINTF (stderr, "%s",  "D");
 #endif
   GNUNET_assert (GNUNET_OK == success);
   GNUNET_SCHEDULER_add_now (&run_continuation, crc);
@@ -284,7 +284,7 @@ run_tests (void *cls, int success, struct GNUNET_TIME_Absolute min_expiration, c
 
   if (success != GNUNET_YES)
   {
-    fprintf (stderr,
+    FPRINTF (stderr,
              "Test 'put' operation failed with error `%s' database likely not setup, skipping test.",
              msg);
     GNUNET_free (crc);
@@ -314,7 +314,7 @@ run (void *cls, char *const *args, const char *cfgfile,
                             (GNUNET_TIME_UNIT_SECONDS), 0, 1,
                             GNUNET_TIME_UNIT_MINUTES, &run_tests, crc))
   {
-    fprintf (stderr, "Test 'put' operation failed.\n");
+    FPRINTF (stderr, "%s",  "Test 'put' operation failed.\n");
     ok = 1;
     GNUNET_free (crc);
   }
@@ -396,7 +396,7 @@ main (int argc, char *argv[])
   if (pos != plugin_name)
     pos[0] = '.';
 #if REPORT_ID
-  fprintf (stderr, "\n");
+  FPRINTF (stderr, "%s",  "\n");
 #endif
   GNUNET_DISK_directory_remove (dir_name);
   return ret;
diff --git a/src/datastore/perf_plugin_datastore.c b/src/datastore/perf_plugin_datastore.c
index 8f552c4eb..6106b11cb 100644
--- a/src/datastore/perf_plugin_datastore.c
+++ b/src/datastore/perf_plugin_datastore.c
@@ -135,7 +135,7 @@ putValue (struct GNUNET_DATASTORE_PluginFunctions *api, int i, int k)
                                GNUNET_CRYPTO_random_u32
                                (GNUNET_CRYPTO_QUALITY_WEAK, 1000))), &msg))
   {
-    fprintf (stderr, "ERROR: `%s'\n", msg);
+    FPRINTF (stderr, "ERROR: `%s'\n", msg);
     GNUNET_free_non_null (msg);
     return;
   }
@@ -165,7 +165,7 @@ iterate_zeros (void *cls, const GNUNET_HashCode * key, uint32_t size,
   hits[i / 8] |= (1 << (i % 8));
 
 #if VERBOSE
-  fprintf (stderr, "Found result type=%u, priority=%u, size=%u, expire=%llu\n",
+  FPRINTF (stderr, "Found result type=%u, priority=%u, size=%u, expire=%llu\n",
            type, priority, size, (unsigned long long) expiration.abs_value);
 #endif
   crc->cnt++;
@@ -344,7 +344,7 @@ test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     crc->phase = RP_ERROR;
   }
 #if VERBOSE
-  fprintf (stderr, "In phase %d, iteration %u\n", crc->phase, crc->cnt);
+  FPRINTF (stderr, "In phase %d, iteration %u\n", crc->phase, crc->cnt);
 #endif
   switch (crc->phase)
   {
@@ -422,7 +422,7 @@ load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg)
   GNUNET_asprintf (&libname, "libgnunet_plugin_datastore_%s", name);
   if (NULL == (ret = GNUNET_PLUGIN_load (libname, &env)))
   {
-    fprintf (stderr, "Failed to load plugin `%s'!\n", name);
+    FPRINTF (stderr, "Failed to load plugin `%s'!\n", name);
     return NULL;
   }
   GNUNET_free (libname);
@@ -441,8 +441,8 @@ run (void *cls, char *const *args, const char *cfgfile,
   api = load_plugin (c);
   if (api == NULL)
   {
-    fprintf (stderr,
-             "Could not initialize plugin, assuming database not configured. Test not run!\n");
+    FPRINTF (stderr,
+             "Could not initialize plugin, assuming database not configured. Test not run!\n", NULL);
     return;
   }
   crc = GNUNET_malloc (sizeof (struct CpsRunContext));
@@ -478,7 +478,7 @@ check ()
   GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
                       "perf-plugin-datastore", "nohelp", options, &run, NULL);
   if (ok != 0)
-    fprintf (stderr, "Missed some testcases: %u\n", ok);
+    FPRINTF (stderr, "Missed some testcases: %u\n", ok);
   return ok;
 }
 
diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c
index 942e0a11e..df6d3af62 100644
--- a/src/datastore/test_datastore_api.c
+++ b/src/datastore/test_datastore_api.c
@@ -193,10 +193,10 @@ check_value (void *cls, const GNUNET_HashCode * key, size_t size,
     return;
   }
 #if 0
-  fprintf (stderr, "Check value got `%s' of size %u, type %d, expire %llu\n",
+  FPRINTF (stderr, "Check value got `%s' of size %u, type %d, expire %llu\n",
            GNUNET_h2s (key), (unsigned int) size, type,
            (unsigned long long) expiration.abs_value);
-  fprintf (stderr,
+  FPRINTF (stderr,
            "Check value iteration %d wants size %u, type %d, expire %llu\n", i,
            (unsigned int) get_size (i), get_type (i),
            (unsigned long long) get_expiration (i).abs_value);
@@ -461,11 +461,11 @@ run_tests (void *cls, int32_t success, struct GNUNET_TIME_Absolute min_expiratio
                                        GNUNET_SCHEDULER_REASON_PREREQ_DONE);
     return;
   case GNUNET_NO:
-    fprintf (stderr, "Test 'put' operation failed, key already exists (!?)\n");
+    FPRINTF (stderr, "%s", "Test 'put' operation failed, key already exists (!?)\n");
     GNUNET_free (crc);
     return;
   case GNUNET_SYSERR:
-    fprintf (stderr,
+    FPRINTF (stderr,
              "Test 'put' operation failed with error `%s' database likely not setup, skipping test.\n",
              msg);
     GNUNET_free (crc);
@@ -495,7 +495,7 @@ run (void *cls, char *const *args, const char *cfgfile,
                             (GNUNET_TIME_UNIT_SECONDS), 0, 1,
                             GNUNET_TIME_UNIT_MINUTES, &run_tests, crc))
   {
-    fprintf (stderr, "Test 'put' operation failed.\n");
+    FPRINTF (stderr, "%s",  "Test 'put' operation failed.\n");
     ok = 1;
     GNUNET_free (crc);
   }
@@ -548,7 +548,7 @@ check ()
   proc = NULL;
 #endif
   if (ok != 0)
-    fprintf (stderr, "Missed some testcases: %u\n", ok);
+    FPRINTF (stderr, "Missed some testcases: %u\n", ok);
   return ok;
 }
 
diff --git a/src/datastore/test_datastore_api_management.c b/src/datastore/test_datastore_api_management.c
index 3cb8ed94a..20a405d07 100644
--- a/src/datastore/test_datastore_api_management.c
+++ b/src/datastore/test_datastore_api_management.c
@@ -252,7 +252,7 @@ run_tests (void *cls, int success, struct GNUNET_TIME_Absolute min_expiration, c
 
   if (success != GNUNET_YES)
   {
-    fprintf (stderr,
+    FPRINTF (stderr,
              "Test 'put' operation failed with error `%s' database likely not setup, skipping test.",
              msg);
     GNUNET_free (crc);
@@ -282,7 +282,7 @@ run (void *cls, char *const *args, const char *cfgfile,
                             (GNUNET_TIME_UNIT_SECONDS), 0, 1,
                             GNUNET_TIME_UNIT_MINUTES, &run_tests, crc))
   {
-    fprintf (stderr, "Test 'put' operation failed.\n");
+    FPRINTF (stderr, "%s",  "Test 'put' operation failed.\n");
     GNUNET_free (crc);
     ok = 1;
   }
@@ -331,7 +331,7 @@ check ()
   GNUNET_OS_process_close (proc);
   proc = NULL;
   if (ok != 0)
-    fprintf (stderr, "Missed some testcases: %u\n", ok);
+    FPRINTF (stderr, "Missed some testcases: %u\n", ok);
   return ok;
 }
 
diff --git a/src/datastore/test_plugin_datastore.c b/src/datastore/test_plugin_datastore.c
index 3504945ae..ca894ff33 100644
--- a/src/datastore/test_plugin_datastore.c
+++ b/src/datastore/test_plugin_datastore.c
@@ -118,7 +118,7 @@ put_value (struct GNUNET_DATASTORE_PluginFunctions *api, int i, int k)
   msg = NULL;
   prio = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 100);
 #if VERBOSE
-  fprintf (stderr, "putting type %u, anon %u under key %s\n", i + 1, i,
+  FPRINTF (stderr, "putting type %u, anon %u under key %s\n", i + 1, i,
            GNUNET_h2s (&key));
 #endif
   if (GNUNET_OK != api->put (api->cls, &key, size, value, i + 1 /* type */ ,
@@ -131,7 +131,7 @@ put_value (struct GNUNET_DATASTORE_PluginFunctions *api, int i, int k)
                                GNUNET_CRYPTO_random_u32
                                (GNUNET_CRYPTO_QUALITY_WEAK, 1000))), &msg))
   {
-    fprintf (stderr, "ERROR: `%s'\n", msg);
+    FPRINTF (stderr, "ERROR: `%s'\n", msg);
     GNUNET_free_non_null (msg);
     return;
   }
@@ -160,7 +160,7 @@ iterate_one_shot (void *cls, const GNUNET_HashCode * key, uint32_t size,
   guid = uid;
   crc->phase++;
 #if VERBOSE
-  fprintf (stderr,
+  FPRINTF (stderr,
            "Found result type=%u, priority=%u, size=%u, expire=%llu, key %s\n",
            type, priority, size, (unsigned long long) expiration.abs_value,
            GNUNET_h2s (key));
@@ -230,7 +230,7 @@ test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     crc->phase = RP_ERROR;
   }
 #if VERBOSE
-  fprintf (stderr, "In phase %d, iteration %u\n", crc->phase, crc->cnt);
+  FPRINTF (stderr, "In phase %d, iteration %u\n", crc->phase, crc->cnt);
 #endif
   switch (crc->phase)
   {
@@ -324,7 +324,7 @@ load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg)
   GNUNET_asprintf (&libname, "libgnunet_plugin_datastore_%s", name);
   if (NULL == (ret = GNUNET_PLUGIN_load (libname, &env)))
   {
-    fprintf (stderr, "Failed to load plugin `%s'!\n", name);
+    FPRINTF (stderr, "Failed to load plugin `%s'!\n", name);
     return NULL;
   }
   GNUNET_free (libname);
@@ -343,8 +343,8 @@ run (void *cls, char *const *args, const char *cfgfile,
   api = load_plugin (c);
   if (api == NULL)
   {
-    fprintf (stderr,
-             "Could not initialize plugin, assuming database not configured. Test not run!\n");
+    FPRINTF (stderr,
+             "Could not initialize plugin, assuming database not configured. Test not run!\n", NULL);
     return;
   }
   crc = GNUNET_malloc (sizeof (struct CpsRunContext));
@@ -378,7 +378,7 @@ check ()
   GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
                       "test-plugin-datastore", "nohelp", options, &run, NULL);
   if (ok != 0)
-    fprintf (stderr, "Missed some testcases: %u\n", ok);
+    FPRINTF (stderr, "Missed some testcases: %u\n", ok);
   return ok;
 }