From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 4 Jul 2018 21:54:43 +0000 (+0200)
Subject: systemctl: fix assert for failed mktime conversion
X-Git-Tag: v240~950^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=855a86a3497178b368d3b04df9503e7051f85b8d;p=thirdparty%2Fsystemd.git

systemctl: fix assert for failed mktime conversion

mktime returns -1 on error, so checking for != 0 is not useful.
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index d673223a274..34b2969f6ab 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -7823,7 +7823,8 @@ static int parse_shutdown_time_spec(const char *t, usec_t *_u) {
                 tm.tm_min = (int) minute;
                 tm.tm_sec = 0;
 
-                assert_se(s = mktime(&tm));
+                s = mktime(&tm);
+                assert(s >= 0);
 
                 *_u = (usec_t) s * USEC_PER_SEC;