chiark / gitweb /
basic/path-util: use FLAGS_SET in one more place
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 4 Jun 2018 08:29:23 +0000 (10:29 +0200)
committerSven Eden <yamakuzure@gmx.net>
Fri, 24 Aug 2018 14:47:08 +0000 (16:47 +0200)
src/basic/path-util.c

index 7246bc8c0296efedad397d5fcc50690f87a5a391..d7862f1398789d3108f6f4f4bf3aa5341ba3c45d 100644 (file)
@@ -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);