aboutsummaryrefslogtreecommitdiff
path: root/src/arm/gnunet-arm.c
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/arm/gnunet-arm.c
parent831572e37e88c219e13d558d9abac23160a10741 (diff)
downloadgnunet-baffe75109684b28fbf814582984cc780ca93951.tar.gz
gnunet-baffe75109684b28fbf814582984cc780ca93951.zip
fix more of #4890
Diffstat (limited to 'src/arm/gnunet-arm.c')
-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 65a6463cf..3c52137bc 100644
--- a/src/arm/gnunet-arm.c
+++ b/src/arm/gnunet-arm.c
@@ -245,27 +245,27 @@ ret_string (enum GNUNET_ARM_Result result)
245 switch (result) 245 switch (result)
246 { 246 {
247 case GNUNET_ARM_RESULT_STOPPED: 247 case GNUNET_ARM_RESULT_STOPPED:
248 return _("%s is stopped"); 248 return _("is stopped");
249 case GNUNET_ARM_RESULT_STARTING: 249 case GNUNET_ARM_RESULT_STARTING:
250 return _("%s is starting"); 250 return _("is starting");
251 case GNUNET_ARM_RESULT_STOPPING: 251 case GNUNET_ARM_RESULT_STOPPING:
252 return _("%s is stopping"); 252 return _("is stopping");
253 case GNUNET_ARM_RESULT_IS_STARTING_ALREADY: 253 case GNUNET_ARM_RESULT_IS_STARTING_ALREADY:
254 return _("%s is starting already"); 254 return _("is starting already");
255 case GNUNET_ARM_RESULT_IS_STOPPING_ALREADY: 255 case GNUNET_ARM_RESULT_IS_STOPPING_ALREADY:
256 return _("%s is stopping already"); 256 return _("is stopping already");
257 case GNUNET_ARM_RESULT_IS_STARTED_ALREADY: 257 case GNUNET_ARM_RESULT_IS_STARTED_ALREADY:
258 return _("%s is started already"); 258 return _("is started already");
259 case GNUNET_ARM_RESULT_IS_STOPPED_ALREADY: 259 case GNUNET_ARM_RESULT_IS_STOPPED_ALREADY:
260 return _("%s is stopped already"); 260 return _("is stopped already");
261 case GNUNET_ARM_RESULT_IS_NOT_KNOWN: 261 case GNUNET_ARM_RESULT_IS_NOT_KNOWN:
262 return _("%s service is not known to ARM"); 262 return _("service is not known to ARM");
263 case GNUNET_ARM_RESULT_START_FAILED: 263 case GNUNET_ARM_RESULT_START_FAILED:
264 return _("%s service failed to start"); 264 return _("service failed to start");
265 case GNUNET_ARM_RESULT_IN_SHUTDOWN: 265 case GNUNET_ARM_RESULT_IN_SHUTDOWN:
266 return _("%s service cannot be started because ARM is shutting down"); 266 return _("service cannot be started because ARM is shutting down");
267 } 267 }
268 return _("%.s Unknown result code."); 268 return _("Unknown result code.");
269} 269}
270 270
271 271
@@ -378,10 +378,9 @@ stop_callback (void *cls,
378 (GNUNET_ARM_RESULT_STOPPED != result) && 378 (GNUNET_ARM_RESULT_STOPPED != result) &&
379 (GNUNET_ARM_RESULT_IS_STOPPED_ALREADY != result)) 379 (GNUNET_ARM_RESULT_IS_STOPPED_ALREADY != result))
380 { 380 {
381 GNUNET_asprintf (&msg, "%s", 381 FPRINTF (stdout,
382 _("Failed to stop the ARM service: %s\n")); 382 _("Failed to stop the ARM service: %s\n"),
383 FPRINTF (stdout, msg, ret_string (result)); 383 ret_string (result));
384 GNUNET_free (msg);
385 GNUNET_SCHEDULER_shutdown (); 384 GNUNET_SCHEDULER_shutdown ();
386 return; 385 return;
387 } 386 }
@@ -476,11 +475,10 @@ term_callback (void *cls,
476 if ((GNUNET_ARM_RESULT_STOPPED != result) && 475 if ((GNUNET_ARM_RESULT_STOPPED != result) &&
477 (GNUNET_ARM_RESULT_IS_STOPPED_ALREADY != result)) 476 (GNUNET_ARM_RESULT_IS_STOPPED_ALREADY != result))
478 { 477 {
479 GNUNET_asprintf (&msg, 478 FPRINTF (stdout,
480 _("Failed to kill the `%s' service: %s\n"), 479 _("Failed to kill the `%s' service: %s\n"),
481 term, ret_string (result)); 480 term,
482 FPRINTF (stdout, "%s", msg); 481 ret_string (result));
483 GNUNET_free (msg);
484 GNUNET_SCHEDULER_shutdown (); 482 GNUNET_SCHEDULER_shutdown ();
485 return; 483 return;
486 } 484 }