]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
core: pass parse error to log functions when parsing timer expressions 12167/head
authorLennart Poettering <lennart@poettering.net>
Mon, 1 Apr 2019 15:43:29 +0000 (17:43 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 1 Apr 2019 16:25:43 +0000 (18:25 +0200)
src/core/load-fragment.c

index b9388deac244c9190ed25ac0b10ce2580e3a9b8f..6acfd9b8ea4c8d216077c240746c7a9c196aedc2 100644 (file)
@@ -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)