From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 4 Jun 2018 08:29:23 +0000 (+0200)
Subject: basic/path-util: use FLAGS_SET in one more place
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2ec9aee55b39af874d9582d3884c02f43d6c98fe;p=elogind.git

basic/path-util: use FLAGS_SET in one more place
---

diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index 7246bc8c0..d7862f139 100644
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -1009,11 +1009,9 @@ int path_simplify_and_warn(
                 unsigned line,
                 const char *lvalue) {
 
-        bool fatal, absolute;
+        bool absolute, fatal = flag & PATH_CHECK_FATAL;
 
-        assert((flag & (PATH_CHECK_ABSOLUTE | PATH_CHECK_RELATIVE)) != (PATH_CHECK_ABSOLUTE | PATH_CHECK_RELATIVE));
-
-        fatal = flag & PATH_CHECK_FATAL;
+        assert(!FLAGS_SET(flag, PATH_CHECK_ABSOLUTE | PATH_CHECK_RELATIVE));
 
         if (!utf8_is_valid(path)) {
                 log_syntax_invalid_utf8(unit, LOG_ERR, filename, line, path);