]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
manager: normalize /run disk space checks
authorLennart Poettering <lennart@poettering.net>
Tue, 9 Oct 2018 14:02:31 +0000 (16:02 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 9 Oct 2018 17:43:43 +0000 (19:43 +0200)
Let's avoid using a variable needlessly. More importantly, special case
the error, not the regular case.

src/core/manager.c

index 0f2bff0cac612b2a39491ef35c762fdfcf672712..d9e9dddea3a58b4b5e2fe5413ad6d7ec5ac6e47c 100644 (file)
@@ -2551,9 +2551,10 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t
         case SIGTERM:
                 if (MANAGER_IS_SYSTEM(m)) {
                         /* This is for compatibility with the original sysvinit */
-                        r = verify_run_space_and_log("Refusing to reexecute");
-                        if (r >= 0)
-                                m->objective = MANAGER_REEXECUTE;
+                        if (verify_run_space_and_log("Refusing to reexecute") < 0)
+                                break;
+
+                        m->objective = MANAGER_REEXECUTE;
                         break;
                 }
 
@@ -2609,9 +2610,10 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t
         }
 
         case SIGHUP:
-                r = verify_run_space_and_log("Refusing to reload");
-                if (r >= 0)
-                        m->objective = MANAGER_RELOAD;
+                if (verify_run_space_and_log("Refusing to reload") < 0)
+                        break;
+
+                m->objective = MANAGER_RELOAD;
                 break;
 
         default: {