3 files changed, 18 insertions, 18 deletions

diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c
index 13b1fdc17..65700ee11 100644
--- a/src/arm/gnunet-arm.c
+++ b/src/arm/gnunet-arm.c
@@ -146,47 +146,47 @@ confirm_cb (void *cls,
   switch (result)
   {
   case GNUNET_ARM_PROCESS_UNKNOWN:
-    fprintf (stderr, _("Service `%s' is unknown to ARM.\n"), service);
+    FPRINTF (stderr, _("Service `%s' is unknown to ARM.\n"), service);
     ret = 1;
     break;
   case GNUNET_ARM_PROCESS_DOWN:
     if (quiet != GNUNET_YES)
-      fprintf (stdout, _("Service `%s' has been stopped.\n"), service);
+      FPRINTF (stdout, _("Service `%s' has been stopped.\n"), service);
     break;
   case GNUNET_ARM_PROCESS_ALREADY_RUNNING:
-    fprintf (stderr, _("Service `%s' was already running.\n"), service);
+    FPRINTF (stderr, _("Service `%s' was already running.\n"), service);
     ret = 1;
     break;
   case GNUNET_ARM_PROCESS_STARTING:
     if (quiet != GNUNET_YES)
-      fprintf (stdout, _("Service `%s' has been started.\n"), service);
+      FPRINTF (stdout, _("Service `%s' has been started.\n"), service);
     break;
   case GNUNET_ARM_PROCESS_ALREADY_STOPPING:
-    fprintf (stderr, _("Service `%s' was already being stopped.\n"), service);
+    FPRINTF (stderr, _("Service `%s' was already being stopped.\n"), service);
     ret = 1;
     break;
   case GNUNET_ARM_PROCESS_ALREADY_DOWN:
-    fprintf (stderr, _("Service `%s' was already not running.\n"), service);
+    FPRINTF (stderr, _("Service `%s' was already not running.\n"), service);
     ret = 1;
     break;
   case GNUNET_ARM_PROCESS_SHUTDOWN:
-    fprintf (stderr, _("Request ignored as ARM is shutting down.\n"));
+    FPRINTF (stderr, "%s", _("Request ignored as ARM is shutting down.\n"));
     ret = 1;
     break;
   case GNUNET_ARM_PROCESS_COMMUNICATION_ERROR:
-    fprintf (stderr, _("Error communicating with ARM service.\n"));
+    FPRINTF (stderr, "%s", _("Error communicating with ARM service.\n"));
     ret = 1;
     break;
   case GNUNET_ARM_PROCESS_COMMUNICATION_TIMEOUT:
-    fprintf (stderr, _("Timeout communicating with ARM service.\n"));
+    FPRINTF (stderr, "%s",  _("Timeout communicating with ARM service.\n"));
     ret = 1;
     break;
   case GNUNET_ARM_PROCESS_FAILURE:
-    fprintf (stderr, _("Operation failed.\n"));
+    FPRINTF (stderr, "%s",  _("Operation failed.\n"));
     ret = 1;
     break;
   default:
-    fprintf (stderr, _("Unknown response code from ARM.\n"));
+    FPRINTF (stderr, "%s",  _("Unknown response code from ARM.\n"));
     break;
   }
   GNUNET_SCHEDULER_add_continuation (&cps_loop, NULL,
diff --git a/src/arm/test_exponential_backoff.c b/src/arm/test_exponential_backoff.c
index 029ed145a..df0efb7f5 100644
--- a/src/arm/test_exponential_backoff.c
+++ b/src/arm/test_exponential_backoff.c
@@ -303,15 +303,15 @@ do_nothing_restarted_notify_task (void *cls,
 #if LOG_BACKOFF
   if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
     {
-      fprintf (killLogFilePtr, "%d.Reason is shutdown!\n", trialCount);
+      FPRINTF (killLogFilePtr, "%d.Reason is shutdown!\n", trialCount);
     }
   else if ((tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT) != 0)
     {
-      fprintf (killLogFilePtr, "%d.Reason is timeout!\n", trialCount);
+      FPRINTF (killLogFilePtr, "%d.Reason is timeout!\n", trialCount);
     }
   else if ((tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE) != 0)
     {
-      fprintf (killLogFilePtr, "%d.Service is running!\n", trialCount);
+      FPRINTF (killLogFilePtr, "%d.Service is running!\n", trialCount);
     }
 #endif
   GNUNET_SCHEDULER_add_now (&kill_task, &a);
@@ -345,7 +345,7 @@ kill_task (void *cbData, const struct GNUNET_SCHEDULER_TaskContext *tc)
       waitedFor = GNUNET_TIME_absolute_get_duration (startedWaitingAt);
 
 #if LOG_BACKOFF
-      fprintf (killLogFilePtr, "Waited for: %llu ms\n",
+      FPRINTF (killLogFilePtr, "Waited for: %llu ms\n",
                (unsigned long long) waitedFor.rel_value);
 #endif
     }
diff --git a/src/arm/test_gnunet_service_manager.c b/src/arm/test_gnunet_service_manager.c
index 2be86e79f..dd12bbd31 100644
--- a/src/arm/test_gnunet_service_manager.c
+++ b/src/arm/test_gnunet_service_manager.c
@@ -161,13 +161,13 @@ main (int argc, char *argv[])
     {
       GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
                            "gethostname");
-      fprintf (stderr,
-               "Failed to determine my own hostname, testcase not run.\n");
+      FPRINTF (stderr,
+               "Failed to determine my own hostname, testcase not run.\n", NULL);
       return 0;
     }
   if (NULL == gethostbyname (hostname))
     {
-      fprintf (stderr,
+      FPRINTF (stderr,
                "Failed to resolve my hostname `%s', testcase not run.\n",
                hostname);
       return 0;