hostnamed,localed,timedate: properly propagate errors from sd_event_add_signal()

main() can't doesn't expect negative error codes as return.

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index d8074e6..a053507 100644 (file)
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -732,12 +732,16 @@ int main(int argc, char *argv[]) {
         (void) sd_event_set_watchdog(event, true);
 
         r = sd_event_add_signal(event, NULL, SIGINT, NULL, NULL);
-        if (r < 0)
-                return r;
+        if (r < 0) {
+                log_error_errno(r, "Failed to install SIGINT handler: %m");
+                goto finish;
+        }
 
         r = sd_event_add_signal(event, NULL, SIGTERM, NULL, NULL);
-        if (r < 0)
-                return r;
+        if (r < 0) {
+                log_error_errno(r, "Failed to install SIGTERM handler: %m");
+                goto finish;
+        }
 
         r = connect_bus(&context, event, &bus);
         if (r < 0)

diff --git a/src/locale/localed.c b/src/locale/localed.c
index 1f0c3ac..c949fa3 100644 (file)
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -751,12 +751,16 @@ int main(int argc, char *argv[]) {
         (void) sd_event_set_watchdog(event, true);
 
         r = sd_event_add_signal(event, NULL, SIGINT, NULL, NULL);
-        if (r < 0)
-                return r;
+        if (r < 0) {
+                log_error_errno(r, "Failed to install SIGINT handler: %m");
+                goto finish;
+        }
 
         r = sd_event_add_signal(event, NULL, SIGTERM, NULL, NULL);
-        if (r < 0)
-                return r;
+        if (r < 0) {
+                log_error_errno(r, "Failed to install SIGTERM handler: %m");
+                goto finish;
+        }
 
         r = connect_bus(&context, event, &bus);
         if (r < 0)

diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 8cf5e8d..71f2f6f 100644 (file)
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -987,12 +987,16 @@ int main(int argc, char *argv[]) {
         (void) sd_event_set_watchdog(event, true);
 
         r = sd_event_add_signal(event, NULL, SIGINT, NULL, NULL);
-        if (r < 0)
-                return r;
+        if (r < 0) {
+                log_error_errno(r, "Failed to install SIGINT handler: %m");
+                goto finish;
+        }
 
         r = sd_event_add_signal(event, NULL, SIGTERM, NULL, NULL);
-        if (r < 0)
-                return r;
+        if (r < 0) {
+                log_error_errno(r, "Failed to install SIGTERM handler: %m");
+                goto finish;
+        }
 
         r = connect_bus(&context, event, &bus);
         if (r < 0)