>From 4d279e1818dd05dccdf4595a5bf1f3dc32c3e8c2 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Tue, 10 Mar 2015 08:58:23 +0100 Subject: [PATCH 1/5] fsckd: Don't use strjoina on gettext() call --- src/fsckd/fsckd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fsckd/fsckd.c b/src/fsckd/fsckd.c index dedc828..3fc923b 100644 --- a/src/fsckd/fsckd.c +++ b/src/fsckd/fsckd.c @@ -242,7 +242,7 @@ static int plymouth_send_message(int plymouth_fd, const char *message, bool upda } static int manager_send_plymouth_message(Manager *m, const char *message) { - const char *plymouth_cancel_message = NULL; + _cleanup_free_ const char *plymouth_cancel_message = NULL; int r; r = manager_connect_plymouth(m); @@ -258,7 +258,7 @@ static int manager_send_plymouth_message(Manager *m, const char *message) { m->plymouth_cancel_sent = true; - plymouth_cancel_message = strjoina("fsckd-cancel-msg:", _("Press Ctrl+C to cancel all filesystem checks in progress")); + plymouth_cancel_message = strjoin("fsckd-cancel-msg:", _("Press Ctrl+C to cancel all filesystem checks in progress"), NULL); r = plymouth_send_message(m->plymouth_fd, plymouth_cancel_message, false); if (r < 0) -- 2.1.4