]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
core: Unit's condition_result field is a boolean
authorLennart Poettering <lennart@poettering.net>
Fri, 27 Aug 2021 14:49:12 +0000 (16:49 +0200)
committerLuca Boccassi <luca.boccassi@gmail.com>
Fri, 27 Aug 2021 20:46:10 +0000 (21:46 +0100)
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.

src/core/unit.c

index 48e7b95e56d03ffeafed4ee1ff39219c1995a01c..03cd28826b0d56510ddb321a82ec63845e987661 100644 (file)
@@ -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,