treewide: more log_*_errno + return simplifications

[elogind.git] / src / core / main.c

diff --git a/src/core/main.c b/src/core/main.c
index c204758d43773379ebf22213d2410964feeeb3ea..4acf3f1882681698af1b173f4f9954380a5b31ee 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -231,18 +231,14 @@ static int console_setup(void) {
         int r;
 
         tty_fd = open_terminal("/dev/console", O_WRONLY|O_NOCTTY|O_CLOEXEC);
-        if (tty_fd < 0) {
-                log_error_errno(tty_fd, "Failed to open /dev/console: %m");
-                return tty_fd;
-        }
+        if (tty_fd < 0)
+                return log_error_errno(tty_fd, "Failed to open /dev/console: %m");
 
         /* We don't want to force text mode.  plymouth may be showing
          * pictures already from initrd. */
         r = reset_terminal_fd(tty_fd, false);
-        if (r < 0) {
-                log_error_errno(r, "Failed to reset /dev/console: %m");
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to reset /dev/console: %m");
 
         return 0;
 }
@@ -806,10 +802,8 @@ static int parse_argv(int argc, char *argv[]) {
                 case ARG_UNIT:
 
                         r = set_default_unit(optarg);
-                        if (r < 0) {
-                                log_error_errno(r, "Failed to set default unit %s: %m", optarg);
-                                return r;
-                        }
+                        if (r < 0)
+                                return log_error_errno(r, "Failed to set default unit %s: %m", optarg);
 
                         break;
 
@@ -1070,10 +1064,8 @@ static int bump_rlimit_nofile(struct rlimit *saved_rlimit) {
         /* Bump up the resource limit for ourselves substantially */
         nl.rlim_cur = nl.rlim_max = 64*1024;
         r = setrlimit_closest(RLIMIT_NOFILE, &nl);
-        if (r < 0) {
-                log_error_errno(r, "Setting RLIMIT_NOFILE failed: %m");
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Setting RLIMIT_NOFILE failed: %m");
 
         return 0;
 }
@@ -1695,7 +1687,7 @@ int main(int argc, char *argv[]) {
                 if (r < 0)
                         log_error("Failed to load default target: %s", bus_error_message(&error, r));
                 else if (target->load_state == UNIT_ERROR || target->load_state == UNIT_NOT_FOUND)
-                        log_error("Failed to load default target: %s", strerror(-target->load_error));
+                        log_error_errno(target->load_error, "Failed to load default target: %m");
                 else if (target->load_state == UNIT_MASKED)
                         log_error("Default target masked.");
 
@@ -1708,7 +1700,7 @@ int main(int argc, char *argv[]) {
                                 error_message = "Failed to load rescue target";
                                 goto finish;
                         } else if (target->load_state == UNIT_ERROR || target->load_state == UNIT_NOT_FOUND) {
-                                log_emergency("Failed to load rescue target: %s", strerror(-target->load_error));
+                                log_emergency_errno(target->load_error, "Failed to load rescue target: %m");
                                 error_message = "Failed to load rescue target";
                                 goto finish;
                         } else if (target->load_state == UNIT_MASKED) {