diff options
Diffstat (limited to 'src/arm/gnunet-arm.c')
-rw-r--r-- | src/arm/gnunet-arm.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c index f7ff536be..cf5e1592a 100644 --- a/src/arm/gnunet-arm.c +++ b/src/arm/gnunet-arm.c | |||
@@ -177,14 +177,14 @@ confirm_cb (void *cls, int success) | |||
177 | break; | 177 | break; |
178 | case GNUNET_SYSERR: | 178 | case GNUNET_SYSERR: |
179 | if (quiet != GNUNET_YES) | 179 | if (quiet != GNUNET_YES) |
180 | fprintf (stdout, | 180 | fprintf (stdout, _("Some error communicating with service `%s'.\n"), |
181 | _("Some error communicating with service `%s'.\n"), service); | 181 | service); |
182 | ret = 1; | 182 | ret = 1; |
183 | break; | 183 | break; |
184 | } | 184 | } |
185 | 185 | ||
186 | GNUNET_SCHEDULER_add_continuation (&cps_loop, | 186 | GNUNET_SCHEDULER_add_continuation (&cps_loop, NULL, |
187 | NULL, GNUNET_SCHEDULER_REASON_PREREQ_DONE); | 187 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); |
188 | } | 188 | } |
189 | 189 | ||
190 | 190 | ||
@@ -210,8 +210,8 @@ confirm_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
210 | if (quiet != GNUNET_YES) | 210 | if (quiet != GNUNET_YES) |
211 | fprintf (stdout, _("Service `%s' is not running.\n"), service); | 211 | fprintf (stdout, _("Service `%s' is not running.\n"), service); |
212 | } | 212 | } |
213 | GNUNET_SCHEDULER_add_continuation (&cps_loop, | 213 | GNUNET_SCHEDULER_add_continuation (&cps_loop, NULL, |
214 | NULL, GNUNET_SCHEDULER_REASON_PREREQ_DONE); | 214 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); |
215 | } | 215 | } |
216 | 216 | ||
217 | 217 | ||
@@ -224,9 +224,8 @@ confirm_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
224 | * @param c configuration | 224 | * @param c configuration |
225 | */ | 225 | */ |
226 | static void | 226 | static void |
227 | run (void *cls, | 227 | run (void *cls, char *const *args, const char *cfgfile, |
228 | char *const *args, | 228 | const struct GNUNET_CONFIGURATION_Handle *c) |
229 | const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c) | ||
230 | { | 229 | { |
231 | cfg = c; | 230 | cfg = c; |
232 | config_file = cfgfile; | 231 | config_file = cfgfile; |
@@ -247,8 +246,8 @@ run (void *cls, | |||
247 | ret = 1; | 246 | ret = 1; |
248 | return; | 247 | return; |
249 | } | 248 | } |
250 | GNUNET_SCHEDULER_add_continuation (&cps_loop, | 249 | GNUNET_SCHEDULER_add_continuation (&cps_loop, NULL, |
251 | NULL, GNUNET_SCHEDULER_REASON_PREREQ_DONE); | 250 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); |
252 | } | 251 | } |
253 | 252 | ||
254 | /** | 253 | /** |
@@ -306,8 +305,9 @@ cps_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
306 | { | 305 | { |
307 | GNUNET_ARM_stop_service (h, "arm", | 306 | GNUNET_ARM_stop_service (h, "arm", |
308 | (0 == | 307 | (0 == |
309 | timeout.rel_value) ? STOP_TIMEOUT_ARM : | 308 | timeout. |
310 | timeout, &confirm_cb, "arm"); | 309 | rel_value) ? STOP_TIMEOUT_ARM : timeout, |
310 | &confirm_cb, "arm"); | ||
311 | return; | 311 | return; |
312 | } | 312 | } |
313 | break; | 313 | break; |
@@ -336,8 +336,9 @@ cps_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
336 | { | 336 | { |
337 | GNUNET_CLIENT_service_test (test, cfg, | 337 | GNUNET_CLIENT_service_test (test, cfg, |
338 | (0 == | 338 | (0 == |
339 | timeout.rel_value) ? TEST_TIMEOUT : | 339 | timeout. |
340 | timeout, &confirm_task, test); | 340 | rel_value) ? TEST_TIMEOUT : timeout, |
341 | &confirm_task, test); | ||
341 | return; | 342 | return; |
342 | } | 343 | } |
343 | break; | 344 | break; |
@@ -412,12 +413,11 @@ main (int argc, char *const *argv) | |||
412 | if (temp_timeout_ms > 0) | 413 | if (temp_timeout_ms > 0) |
413 | timeout.rel_value = temp_timeout_ms; | 414 | timeout.rel_value = temp_timeout_ms; |
414 | 415 | ||
415 | if (GNUNET_OK == GNUNET_PROGRAM_run (argc, | 416 | if (GNUNET_OK == |
416 | argv, | 417 | GNUNET_PROGRAM_run (argc, argv, "gnunet-arm", |
417 | "gnunet-arm", | 418 | gettext_noop |
418 | gettext_noop | 419 | ("Control services and the Automated Restart Manager (ARM)"), |
419 | ("Control services and the Automated Restart Manager (ARM)"), | 420 | options, &run, NULL)) |
420 | options, &run, NULL)) | ||
421 | { | 421 | { |
422 | return ret; | 422 | return ret; |
423 | } | 423 | } |