diff options
Diffstat (limited to 'clients/nm-online.c')
| -rw-r--r-- | clients/nm-online.c | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/clients/nm-online.c b/clients/nm-online.c index 38ce03c8..77a11321 100644 --- a/clients/nm-online.c +++ b/clients/nm-online.c @@ -40,7 +40,6 @@ #define PROGRESS_STEPS 15 -#define EXIT_NONE -1 #define EXIT_FAILURE_OFFLINE 1 #define EXIT_FAILURE_ERROR 2 #define EXIT_FAILURE_LIBNM_BUG 42 @@ -81,7 +80,7 @@ _return (OnlineData *data, int retval) } static void -_print_progress (gboolean wait_startup, int progress_next_step_i, gint64 remaining_ms, int retval) +_print_progress (int progress_next_step_i, gint64 remaining_ms, int success) { int i, j; @@ -91,26 +90,8 @@ _print_progress (gboolean wait_startup, int progress_next_step_i, gint64 remaini for (i = 0; i < PROGRESS_STEPS; i++) putchar (i < j ? '.' : ' '); g_print (" %4lds", (long) (MAX (0, remaining_ms + 999) / 1000)); - if (retval != EXIT_NONE) { - const char *result; - - if (wait_startup) { - if (retval == EXIT_SUCCESS) - result = "started"; - else if (retval == EXIT_FAILURE_OFFLINE) - result = "startup-pending"; - else - result = "failure"; - } - else { - if (retval == EXIT_SUCCESS) - result = "online"; - else - result = "offline"; - } - - g_print (" [%s]\n", result); - } + if (success >= 0) + g_print (" [%sline]\n", success ? "on" : "off"); fflush (stdout); } @@ -175,7 +156,7 @@ handle_timeout (gpointer user_data) /* calculate the next step (not the current): floor()+1 */ progress_next_step_i = NM_MIN ((elapsed_ms / data->progress_step_duration) + 1, PROGRESS_STEPS); - _print_progress (data->wait_startup, progress_next_step_i, remaining_ms, EXIT_NONE); + _print_progress (progress_next_step_i, remaining_ms, -1); /* synchronize the timeout with the ticking of the seconds. */ rem = remaining_ms % 1000; @@ -313,7 +294,7 @@ main (int argc, char *argv[]) g_clear_pointer (&data.loop, g_main_loop_unref); if (!data.quiet) - _print_progress (data.wait_startup, -1, NM_MAX (0, data.end_timestamp_ms - _now_ms ()), data.retval); + _print_progress (-1, NM_MAX (0, data.end_timestamp_ms - _now_ms ()), data.retval == EXIT_SUCCESS); return data.retval; } |