From e3b52014e2b3e5cfa1ddc23828b14a9fce3507b3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 26 Jun 2019 16:21:34 +0200 Subject: [PATCH] shared/condition: fix printing of ConditionNull= ConditionNull= is the only condition where parameter==NULL is allowed, and we'd print ConditionNull=(null) or ConditionNull=!(null). --- src/shared/condition.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/shared/condition.c b/src/shared/condition.c index 2d521bc..70ede53 100644 --- a/src/shared/condition.c +++ b/src/shared/condition.c @@ -747,20 +747,23 @@ bool condition_test_list(Condition *first, const char *(*to_string)(ConditionTyp r = condition_test(c); if (logger) { + const char *p = c->type == CONDITION_NULL ? "true" : c->parameter; + assert(p); + if (r < 0) logger(userdata, LOG_WARNING, r, __FILE__, __LINE__, __func__, "Couldn't determine result for %s=%s%s%s, assuming failed: %m", to_string(c->type), c->trigger ? "|" : "", c->negate ? "!" : "", - c->parameter); + p); else logger(userdata, LOG_DEBUG, 0, __FILE__, __LINE__, __func__, "%s=%s%s%s %s.", to_string(c->type), c->trigger ? "|" : "", c->negate ? "!" : "", - c->parameter, + p, condition_result_to_string(c->result)); } -- 2.7.4