From c52b19d65fa9e701d8f1625ef2d26bbd5b4fa3fe Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 9 Oct 2018 16:02:31 +0200 Subject: [PATCH] manager: normalize /run disk space checks Let's avoid using a variable needlessly. More importantly, special case the error, not the regular case. --- src/core/manager.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c index 0f2bff0cac6..d9e9dddea3a 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -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: { -- 2.47.3