From: Daniel Mack <daniel@zonque.org>
Date: Fri, 24 Apr 2015 19:44:51 +0000 (+0200)
Subject: logind: kill newline characters from log_error_errno() calls
X-Git-Tag: v226.4~1^2~424
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=c6f9360e347fcd159edf75b3ebe1de7913fb83e4

logind: kill newline characters from log_error_errno() calls

log_error_errno() already adds a newline, so drop them.
---

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 1eda3c2c8..880fbf73c 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -1544,11 +1544,11 @@ static int delay_shutdown_or_sleep(
         if (m->inhibit_timeout_source) {
                 r = sd_event_source_set_time(m->inhibit_timeout_source, timeout_val);
                 if (r < 0)
-                        return log_error_errno(r, "sd_event_source_set_time() failed: %m\n");
+                        return log_error_errno(r, "sd_event_source_set_time() failed: %m");
 
                 r = sd_event_source_set_enabled(m->inhibit_timeout_source, SD_EVENT_ONESHOT);
                 if (r < 0)
-                        return log_error_errno(r, "sd_event_source_set_enabled() failed: %m\n");
+                        return log_error_errno(r, "sd_event_source_set_enabled() failed: %m");
         } else {
                 r = sd_event_add_time(m->event, &m->inhibit_timeout_source, CLOCK_MONOTONIC,
                                       timeout_val, 0, manager_inhibit_timeout_handler, m);
@@ -1859,7 +1859,7 @@ static int manager_scheduled_shutdown_handler(
 
         r = execute_shutdown_or_sleep(m, 0, target, &error);
         if (r < 0)
-                return log_error_errno(r, "Unable to execute transition to %s: %m\n", target);
+                return log_error_errno(r, "Unable to execute transition to %s: %m", target);
 
         return 0;
 }
@@ -1904,16 +1904,16 @@ static int method_schedule_shutdown(sd_bus *bus, sd_bus_message *message, void *
         if (m->scheduled_shutdown_timeout_source) {
                 r = sd_event_source_set_time(m->scheduled_shutdown_timeout_source, elapse);
                 if (r < 0)
-                        return log_error_errno(r, "sd_event_source_set_time() failed: %m\n");
+                        return log_error_errno(r, "sd_event_source_set_time() failed: %m");
 
                 r = sd_event_source_set_enabled(m->scheduled_shutdown_timeout_source, SD_EVENT_ONESHOT);
                 if (r < 0)
-                        return log_error_errno(r, "sd_event_source_set_enabled() failed: %m\n");
+                        return log_error_errno(r, "sd_event_source_set_enabled() failed: %m");
         } else {
                 r = sd_event_add_time(m->event, &m->scheduled_shutdown_timeout_source,
                                       CLOCK_REALTIME, elapse, 0, manager_scheduled_shutdown_handler, m);
                 if (r < 0)
-                        return log_error_errno(r, "sd_event_add_time() failed: %m\n");
+                        return log_error_errno(r, "sd_event_add_time() failed: %m");
         }
 
         r = free_and_strdup(&m->scheduled_shutdown_type, type);
@@ -1925,16 +1925,16 @@ static int method_schedule_shutdown(sd_bus *bus, sd_bus_message *message, void *
         if (m->nologin_timeout_source) {
                 r = sd_event_source_set_time(m->nologin_timeout_source, elapse);
                 if (r < 0)
-                        return log_error_errno(r, "sd_event_source_set_time() failed: %m\n");
+                        return log_error_errno(r, "sd_event_source_set_time() failed: %m");
 
                 r = sd_event_source_set_enabled(m->nologin_timeout_source, SD_EVENT_ONESHOT);
                 if (r < 0)
-                        return log_error_errno(r, "sd_event_source_set_enabled() failed: %m\n");
+                        return log_error_errno(r, "sd_event_source_set_enabled() failed: %m");
         } else {
                 r = sd_event_add_time(m->event, &m->nologin_timeout_source,
                                       CLOCK_REALTIME, elapse - 5 * USEC_PER_MINUTE, 0, nologin_timeout_handler, m);
                 if (r < 0)
-                        return log_error_errno(r, "sd_event_add_time() failed: %m\n");
+                        return log_error_errno(r, "sd_event_add_time() failed: %m");
         }
 
         m->scheduled_shutdown_timeout = elapse;
diff --git a/src/login/logind-utmp.c b/src/login/logind-utmp.c
index 9bbffe34c..1e13ff01d 100644
--- a/src/login/logind-utmp.c
+++ b/src/login/logind-utmp.c
@@ -122,11 +122,11 @@ static int wall_message_timeout_handler(
         if (next > 0) {
                 r = sd_event_source_set_time(s, n + next);
                 if (r < 0)
-                        return log_error_errno(r, "sd_event_source_set_time() failed. %m\n");
+                        return log_error_errno(r, "sd_event_source_set_time() failed. %m");
 
                 r = sd_event_source_set_enabled(s, SD_EVENT_ONESHOT);
                 if (r < 0)
-                        return log_error_errno(r, "sd_event_source_set_enabled() failed. %m\n");
+                        return log_error_errno(r, "sd_event_source_set_enabled() failed. %m");
         }
 
         return 0;
@@ -166,16 +166,16 @@ int manager_setup_wall_message_timer(Manager *m) {
         if (m->wall_message_timeout_source) {
                 r = sd_event_source_set_time(m->wall_message_timeout_source, n + elapse);
                 if (r < 0)
-                        return log_error_errno(r, "sd_event_source_set_time() failed. %m\n");
+                        return log_error_errno(r, "sd_event_source_set_time() failed. %m");
 
                 r = sd_event_source_set_enabled(m->wall_message_timeout_source, SD_EVENT_ONESHOT);
                 if (r < 0)
-                        return log_error_errno(r, "sd_event_source_set_enabled() failed. %m\n");
+                        return log_error_errno(r, "sd_event_source_set_enabled() failed. %m");
         } else {
                 r = sd_event_add_time(m->event, &m->wall_message_timeout_source,
                                       CLOCK_REALTIME, n + elapse, 0, wall_message_timeout_handler, m);
                 if (r < 0)
-                        return log_error_errno(r, "sd_event_add_time() failed. %m\n");
+                        return log_error_errno(r, "sd_event_add_time() failed. %m");
         }
 
         return 0;