From dc44c96d97cb9eb50fcb20df2488a04b15d2e1e4 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 1 Apr 2019 17:43:29 +0200 Subject: [PATCH] core: pass parse error to log functions when parsing timer expressions --- src/core/load-fragment.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index b9388deac24..6acfd9b8ea4 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -1536,15 +1536,18 @@ int config_parse_timer( } if (ltype == TIMER_CALENDAR) { - if (calendar_spec_from_string(k, &c) < 0) { - log_syntax(unit, LOG_ERR, filename, line, 0, "Failed to parse calendar specification, ignoring: %s", k); + r = calendar_spec_from_string(k, &c); + if (r < 0) { + log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse calendar specification, ignoring: %s", k); return 0; } - } else - if (parse_sec(k, &usec) < 0) { - log_syntax(unit, LOG_ERR, filename, line, 0, "Failed to parse timer value, ignoring: %s", k); + } else { + r = parse_sec(k, &usec); + if (r < 0) { + log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse timer value, ignoring: %s", k); return 0; } + } v = new(TimerValue, 1); if (!v) -- 2.39.2