From aea6c4b53f7f1f1d76413ea67737e3c276f60f46 Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Sun, 16 Nov 2025 15:33:53 +0100 Subject: [PATCH] core/unit: modernize unit_process_job() a bit * Inline one condition * Annotate boolean args with names --- src/core/unit.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/core/unit.c b/src/core/unit.c index 8a406a93341..ddae43a673f 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -2607,7 +2607,6 @@ static void unit_emit_audit_stop(Unit *u, UnitActiveState state) { static bool unit_process_job(Job *j, UnitActiveState ns, bool reload_success) { bool unexpected = false; - JobResult result; assert(j); assert(j->installed); @@ -2626,18 +2625,12 @@ static bool unit_process_job(Job *j, UnitActiveState ns, bool reload_success) { case JOB_VERIFY_ACTIVE: if (UNIT_IS_ACTIVE_OR_RELOADING(ns)) - job_finish_and_invalidate(j, JOB_DONE, true, false); + job_finish_and_invalidate(j, JOB_DONE, /* recursive = */ true, /* already = */ false); else if (j->state == JOB_RUNNING && ns != UNIT_ACTIVATING) { unexpected = true; - if (UNIT_IS_INACTIVE_OR_FAILED(ns)) { - if (ns == UNIT_FAILED) - result = JOB_FAILED; - else - result = JOB_DONE; - - job_finish_and_invalidate(j, result, true, false); - } + if (UNIT_IS_INACTIVE_OR_FAILED(ns)) + job_finish_and_invalidate(j, ns == UNIT_FAILED ? JOB_FAILED : JOB_DONE, /* recursive = */ true, /* already = */ false); } break; @@ -2646,10 +2639,10 @@ static bool unit_process_job(Job *j, UnitActiveState ns, bool reload_success) { if (j->state == JOB_RUNNING) { if (ns == UNIT_ACTIVE) - job_finish_and_invalidate(j, reload_success ? JOB_DONE : JOB_FAILED, true, false); + job_finish_and_invalidate(j, reload_success ? JOB_DONE : JOB_FAILED, /* recursive = */ true, /* already = */ false); else if (!IN_SET(ns, UNIT_ACTIVATING, UNIT_RELOADING, UNIT_REFRESHING)) { unexpected = true; - job_finish_and_invalidate(j, reload_success ? JOB_CANCELED : JOB_FAILED, true, false); + job_finish_and_invalidate(j, reload_success ? JOB_CANCELED : JOB_FAILED, /* recursive = */ true, /* already = */ false); } } @@ -2659,10 +2652,10 @@ static bool unit_process_job(Job *j, UnitActiveState ns, bool reload_success) { case JOB_RESTART: if (UNIT_IS_INACTIVE_OR_FAILED(ns)) - job_finish_and_invalidate(j, JOB_DONE, true, false); + job_finish_and_invalidate(j, JOB_DONE, /* recursive = */ true, /* already = */ false); else if (j->state == JOB_RUNNING && ns != UNIT_DEACTIVATING) { unexpected = true; - job_finish_and_invalidate(j, JOB_FAILED, true, false); + job_finish_and_invalidate(j, JOB_FAILED, /* recursive = */ true, /* already = */ false); } break; -- 2.47.3