aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-03-08 15:05:40 +0100
committerChristian Grothoff <christian@grothoff.org>2017-03-08 15:05:40 +0100
commitbaffe75109684b28fbf814582984cc780ca93951 (patch)
tree11c8f88a367b0c54e35b4e2a9bae099c60be14d0 /src
parent831572e37e88c219e13d558d9abac23160a10741 (diff)
fix more of #4890
Diffstat (limited to 'src')
-rw-r--r--src/arm/gnunet-arm.c38
1 files changed, 18 insertions, 20 deletions
diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c
index 65a6463cfb..3c52137bc5 100644
--- a/src/arm/gnunet-arm.c
+++ b/src/arm/gnunet-arm.c
@@ -245,27 +245,27 @@ ret_string (enum GNUNET_ARM_Result result)
switch (result)
{
case GNUNET_ARM_RESULT_STOPPED:
- return _("%s is stopped");
+ return _("is stopped");
case GNUNET_ARM_RESULT_STARTING:
- return _("%s is starting");
+ return _("is starting");
case GNUNET_ARM_RESULT_STOPPING:
- return _("%s is stopping");
+ return _("is stopping");
case GNUNET_ARM_RESULT_IS_STARTING_ALREADY:
- return _("%s is starting already");
+ return _("is starting already");
case GNUNET_ARM_RESULT_IS_STOPPING_ALREADY:
- return _("%s is stopping already");
+ return _("is stopping already");
case GNUNET_ARM_RESULT_IS_STARTED_ALREADY:
- return _("%s is started already");
+ return _("is started already");
case GNUNET_ARM_RESULT_IS_STOPPED_ALREADY:
- return _("%s is stopped already");
+ return _("is stopped already");
case GNUNET_ARM_RESULT_IS_NOT_KNOWN:
- return _("%s service is not known to ARM");
+ return _("service is not known to ARM");
case GNUNET_ARM_RESULT_START_FAILED:
- return _("%s service failed to start");
+ return _("service failed to start");
case GNUNET_ARM_RESULT_IN_SHUTDOWN:
- return _("%s service cannot be started because ARM is shutting down");
+ return _("service cannot be started because ARM is shutting down");
}
- return _("%.s Unknown result code.");
+ return _("Unknown result code.");
}
@@ -378,10 +378,9 @@ stop_callback (void *cls,
(GNUNET_ARM_RESULT_STOPPED != result) &&
(GNUNET_ARM_RESULT_IS_STOPPED_ALREADY != result))
{
- GNUNET_asprintf (&msg, "%s",
- _("Failed to stop the ARM service: %s\n"));
- FPRINTF (stdout, msg, ret_string (result));
- GNUNET_free (msg);
+ FPRINTF (stdout,
+ _("Failed to stop the ARM service: %s\n"),
+ ret_string (result));
GNUNET_SCHEDULER_shutdown ();
return;
}
@@ -476,11 +475,10 @@ term_callback (void *cls,
if ((GNUNET_ARM_RESULT_STOPPED != result) &&
(GNUNET_ARM_RESULT_IS_STOPPED_ALREADY != result))
{
- GNUNET_asprintf (&msg,
- _("Failed to kill the `%s' service: %s\n"),
- term, ret_string (result));
- FPRINTF (stdout, "%s", msg);
- GNUNET_free (msg);
+ FPRINTF (stdout,
+ _("Failed to kill the `%s' service: %s\n"),
+ term,
+ ret_string (result));
GNUNET_SCHEDULER_shutdown ();
return;
}