diff options
Diffstat (limited to 'src/arm/gnunet-arm.c')
-rw-r--r-- | src/arm/gnunet-arm.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c index 7d705733a..f96076231 100644 --- a/src/arm/gnunet-arm.c +++ b/src/arm/gnunet-arm.c | |||
@@ -151,7 +151,7 @@ delete_files () | |||
151 | "Will attempt to remove configuration file %s and service directory %s\n", | 151 | "Will attempt to remove configuration file %s and service directory %s\n", |
152 | config_file, | 152 | config_file, |
153 | dir); | 153 | dir); |
154 | if (0 != UNLINK (config_file)) | 154 | if (0 != unlink (config_file)) |
155 | { | 155 | { |
156 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 156 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
157 | _ ("Failed to remove configuration file %s\n"), | 157 | _ ("Failed to remove configuration file %s\n"), |
@@ -319,7 +319,7 @@ start_callback (void *cls, | |||
319 | op = NULL; | 319 | op = NULL; |
320 | if (GNUNET_ARM_REQUEST_SENT_OK != rs) | 320 | if (GNUNET_ARM_REQUEST_SENT_OK != rs) |
321 | { | 321 | { |
322 | FPRINTF (stdout, | 322 | fprintf (stdout, |
323 | _ ("Failed to start the ARM service: %s\n"), | 323 | _ ("Failed to start the ARM service: %s\n"), |
324 | req_string (rs)); | 324 | req_string (rs)); |
325 | GNUNET_SCHEDULER_shutdown (); | 325 | GNUNET_SCHEDULER_shutdown (); |
@@ -328,7 +328,7 @@ start_callback (void *cls, | |||
328 | if ((GNUNET_ARM_RESULT_STARTING != result) && | 328 | if ((GNUNET_ARM_RESULT_STARTING != result) && |
329 | (GNUNET_ARM_RESULT_IS_STARTED_ALREADY != result)) | 329 | (GNUNET_ARM_RESULT_IS_STARTED_ALREADY != result)) |
330 | { | 330 | { |
331 | FPRINTF (stdout, | 331 | fprintf (stdout, |
332 | _ ("Failed to start the ARM service: %s\n"), | 332 | _ ("Failed to start the ARM service: %s\n"), |
333 | ret_string (result)); | 333 | ret_string (result)); |
334 | GNUNET_SCHEDULER_shutdown (); | 334 | GNUNET_SCHEDULER_shutdown (); |
@@ -366,7 +366,7 @@ stop_callback (void *cls, | |||
366 | "%s", | 366 | "%s", |
367 | _ ( | 367 | _ ( |
368 | "Failed to send a stop request to the ARM service: %s\n")); | 368 | "Failed to send a stop request to the ARM service: %s\n")); |
369 | FPRINTF (stdout, msg, req_string (rs)); | 369 | fprintf (stdout, msg, req_string (rs)); |
370 | GNUNET_free (msg); | 370 | GNUNET_free (msg); |
371 | GNUNET_SCHEDULER_shutdown (); | 371 | GNUNET_SCHEDULER_shutdown (); |
372 | return; | 372 | return; |
@@ -375,7 +375,7 @@ stop_callback (void *cls, | |||
375 | (GNUNET_ARM_RESULT_STOPPED != result) && | 375 | (GNUNET_ARM_RESULT_STOPPED != result) && |
376 | (GNUNET_ARM_RESULT_IS_STOPPED_ALREADY != result)) | 376 | (GNUNET_ARM_RESULT_IS_STOPPED_ALREADY != result)) |
377 | { | 377 | { |
378 | FPRINTF (stdout, | 378 | fprintf (stdout, |
379 | _ ("Failed to stop the ARM service: %s\n"), | 379 | _ ("Failed to stop the ARM service: %s\n"), |
380 | ret_string (result)); | 380 | ret_string (result)); |
381 | GNUNET_SCHEDULER_shutdown (); | 381 | GNUNET_SCHEDULER_shutdown (); |
@@ -413,7 +413,7 @@ init_callback (void *cls, | |||
413 | op = NULL; | 413 | op = NULL; |
414 | if (GNUNET_ARM_REQUEST_SENT_OK != rs) | 414 | if (GNUNET_ARM_REQUEST_SENT_OK != rs) |
415 | { | 415 | { |
416 | FPRINTF (stdout, | 416 | fprintf (stdout, |
417 | _ ("Failed to send a request to start the `%s' service: %s\n"), | 417 | _ ("Failed to send a request to start the `%s' service: %s\n"), |
418 | init, | 418 | init, |
419 | req_string (rs)); | 419 | req_string (rs)); |
@@ -423,7 +423,7 @@ init_callback (void *cls, | |||
423 | if ((GNUNET_ARM_RESULT_STARTING != result) && | 423 | if ((GNUNET_ARM_RESULT_STARTING != result) && |
424 | (GNUNET_ARM_RESULT_IS_STARTED_ALREADY != result)) | 424 | (GNUNET_ARM_RESULT_IS_STARTED_ALREADY != result)) |
425 | { | 425 | { |
426 | FPRINTF (stdout, | 426 | fprintf (stdout, |
427 | _ ("Failed to start the `%s' service: %s\n"), | 427 | _ ("Failed to start the `%s' service: %s\n"), |
428 | init, | 428 | init, |
429 | ret_string (result)); | 429 | ret_string (result)); |
@@ -465,7 +465,7 @@ term_callback (void *cls, | |||
465 | _ ( | 465 | _ ( |
466 | "Failed to send a request to kill the `%s' service: %%s\n"), | 466 | "Failed to send a request to kill the `%s' service: %%s\n"), |
467 | term); | 467 | term); |
468 | FPRINTF (stdout, msg, req_string (rs)); | 468 | fprintf (stdout, msg, req_string (rs)); |
469 | GNUNET_free (msg); | 469 | GNUNET_free (msg); |
470 | GNUNET_SCHEDULER_shutdown (); | 470 | GNUNET_SCHEDULER_shutdown (); |
471 | return; | 471 | return; |
@@ -473,7 +473,7 @@ term_callback (void *cls, | |||
473 | if ((GNUNET_ARM_RESULT_STOPPED != result) && | 473 | if ((GNUNET_ARM_RESULT_STOPPED != result) && |
474 | (GNUNET_ARM_RESULT_IS_STOPPED_ALREADY != result)) | 474 | (GNUNET_ARM_RESULT_IS_STOPPED_ALREADY != result)) |
475 | { | 475 | { |
476 | FPRINTF (stdout, | 476 | fprintf (stdout, |
477 | _ ("Failed to kill the `%s' service: %s\n"), | 477 | _ ("Failed to kill the `%s' service: %s\n"), |
478 | term, | 478 | term, |
479 | ret_string (result)); | 479 | ret_string (result)); |
@@ -515,14 +515,14 @@ list_callback (void *cls, | |||
515 | GNUNET_asprintf (&msg, | 515 | GNUNET_asprintf (&msg, |
516 | "%s", | 516 | "%s", |
517 | _ ("Failed to request a list of services: %s\n")); | 517 | _ ("Failed to request a list of services: %s\n")); |
518 | FPRINTF (stdout, msg, req_string (rs)); | 518 | fprintf (stdout, msg, req_string (rs)); |
519 | GNUNET_free (msg); | 519 | GNUNET_free (msg); |
520 | ret = 3; | 520 | ret = 3; |
521 | GNUNET_SCHEDULER_shutdown (); | 521 | GNUNET_SCHEDULER_shutdown (); |
522 | } | 522 | } |
523 | if (NULL == list) | 523 | if (NULL == list) |
524 | { | 524 | { |
525 | FPRINTF (stderr, | 525 | fprintf (stderr, |
526 | "%s", | 526 | "%s", |
527 | _ ("Error communicating with ARM. ARM not running?\n")); | 527 | _ ("Error communicating with ARM. ARM not running?\n")); |
528 | GNUNET_SCHEDULER_shutdown (); | 528 | GNUNET_SCHEDULER_shutdown (); |
@@ -530,9 +530,9 @@ list_callback (void *cls, | |||
530 | return; | 530 | return; |
531 | } | 531 | } |
532 | if (! quiet) | 532 | if (! quiet) |
533 | FPRINTF (stdout, "%s", _ ("Running services:\n")); | 533 | fprintf (stdout, "%s", _ ("Running services:\n")); |
534 | for (unsigned int i = 0; i < count; i++) | 534 | for (unsigned int i = 0; i < count; i++) |
535 | FPRINTF (stdout, "%s\n", list[i]); | 535 | fprintf (stdout, "%s\n", list[i]); |
536 | al_task = GNUNET_SCHEDULER_add_now (&action_loop, NULL); | 536 | al_task = GNUNET_SCHEDULER_add_now (&action_loop, NULL); |
537 | } | 537 | } |
538 | 538 | ||
@@ -661,9 +661,9 @@ srv_status (void *cls, | |||
661 | if (! quiet) | 661 | if (! quiet) |
662 | { | 662 | { |
663 | if (NULL != msg) | 663 | if (NULL != msg) |
664 | FPRINTF (stderr, msg, service); | 664 | fprintf (stderr, msg, service); |
665 | else | 665 | else |
666 | FPRINTF (stderr, | 666 | fprintf (stderr, |
667 | _ ("Unknown status %u for service %s.\n"), | 667 | _ ("Unknown status %u for service %s.\n"), |
668 | status, | 668 | status, |
669 | service); | 669 | service); |