From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 27 Aug 2021 14:49:12 +0000 (+0200)
Subject: core: Unit's condition_result field is a boolean
X-Git-Tag: v250-rc1~766
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d52cc0a5318cd33438f7e36f8abd42c5c2dbd4a3;p=thirdparty%2Fsystemd.git

core: Unit's condition_result field is a boolean

Let's only assign boolean values to a boolean variable.

Unit's condition_result is not of type ConditionResult, slightly
confusingly. Let's hence not assign one of ConditionResult's values to
it, but simple booleans.

This effectively doesn't make a difference, since CONDITION_ERROR is
true when cast to bool. But it's still ugly to rely on that. And
confusing.
---

diff --git a/src/core/unit.c b/src/core/unit.c
index 48e7b95e56d..03cd28826b0 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1727,7 +1727,7 @@ static bool unit_test_condition(Unit *u) {
         r = manager_get_effective_environment(u->manager, &env);
         if (r < 0) {
                 log_unit_error_errno(u, r, "Failed to determine effective environment: %m");
-                u->condition_result = CONDITION_ERROR;
+                u->condition_result = true;
         } else
                 u->condition_result = condition_test_list(
                                 u->conditions,