treewide: another round of simplifications

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

diff --git a/src/core/main.c b/src/core/main.c
index d8a1ab9d436b89d0bab1c4d4f7fe5259315513ff..c9fd56232c7648160b531d4bd3158fd4cc132af2 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -884,10 +884,8 @@ static int parse_argv(int argc, char *argv[]) {
                         fd_cloexec(fd, true);
 
                         f = fdopen(fd, "r");
                         fd_cloexec(fd, true);
 
                         f = fdopen(fd, "r");

-                        if (!f) {
-                                log_error_errno(errno, "Failed to open serialization fd: %m");
-                                return -errno;
-                        }
+                        if (!f)
+                                return log_error_errno(errno, "Failed to open serialization fd: %m");

 
                         if (arg_serialization)
                                 fclose(arg_serialization);
 
                         if (arg_serialization)
                                 fclose(arg_serialization);


@@ -1045,10 +1043,8 @@ static int bump_rlimit_nofile(struct rlimit *saved_rlimit) {
         /* Save the original RLIMIT_NOFILE so that we can reset it
          * later when transitioning from the initrd to the main
          * systemd or suchlike. */
         /* Save the original RLIMIT_NOFILE so that we can reset it
          * later when transitioning from the initrd to the main
          * systemd or suchlike. */

-        if (getrlimit(RLIMIT_NOFILE, saved_rlimit) < 0) {
-                log_error_errno(errno, "Reading RLIMIT_NOFILE failed: %m");
-                return -errno;
-        }
+        if (getrlimit(RLIMIT_NOFILE, saved_rlimit) < 0)
+                return log_error_errno(errno, "Reading RLIMIT_NOFILE failed: %m");

 
         /* Make sure forked processes get the default kernel setting */
         if (!arg_default_rlimit[RLIMIT_NOFILE]) {
 
         /* Make sure forked processes get the default kernel setting */
         if (!arg_default_rlimit[RLIMIT_NOFILE]) {