From 7cafa247e2187f3c13dd9d786e6752852acd21de Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Tue, 10 Mar 2015 10:18:00 +0100 Subject: [PATCH 5/5] fsckd: rationalize log messages and avoid double prints --- src/fsckd/fsckd.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/fsckd/fsckd.c b/src/fsckd/fsckd.c index b121de3..822962f 100644 --- a/src/fsckd/fsckd.c +++ b/src/fsckd/fsckd.c @@ -320,7 +320,7 @@ static int manager_update_global_progress(Manager *m) { Client *current = NULL; _cleanup_free_ char *console_message = NULL; _cleanup_free_ char *fsck_message = NULL; - int current_numdevices = 0, r; + int current_numdevices = 0; double current_percent = 100; /* get the overall percentage */ @@ -350,10 +350,7 @@ static int manager_update_global_progress(Manager *m) { manager_write_console(m, console_message); /* try to connect to plymouth and send message */ - r = manager_send_plymouth_message(m, fsck_message); - if (r < 0) - log_debug("Couldn't send message to plymouth"); - + manager_send_plymouth_message(m, fsck_message); } return 0; } @@ -382,9 +379,7 @@ static int client_progress_handler(sd_event_source *s, int fd, uint32_t revents, else { log_warning("Closing bad behaving fsck client connection at fd %d", client->fd); client_free(client); - r = manager_update_global_progress(m); - if (r < 0) - log_warning_errno(r, "Couldn't update global progress: %m"); + manager_update_global_progress(m); } return 0; } @@ -408,9 +403,7 @@ static int client_progress_handler(sd_event_source *s, int fd, uint32_t revents, } else log_error_errno(r, "Unknown error while trying to read fsck data: %m"); - r = manager_update_global_progress(m); - if (r < 0) - log_warning_errno(r, "Couldn't update global progress: %m"); + manager_update_global_progress(m); return 0; } -- 2.1.4