projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d94a24c
)
basic/path-util: use FLAGS_SET in one more place
author
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Mon, 4 Jun 2018 08:29:23 +0000
(10:29 +0200)
committer
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Mon, 4 Jun 2018 09:50:44 +0000
(11:50 +0200)
src/basic/path-util.c
patch
|
blob
|
history
diff --git
a/src/basic/path-util.c
b/src/basic/path-util.c
index
690159d
..
547b38e
100644
(file)
--- a/
src/basic/path-util.c
+++ b/
src/basic/path-util.c
@@
-999,11
+999,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);