From 0c21dafb54dea7564c6a0f063492926f495006b9 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 2 Apr 2019 14:49:28 +0200 Subject: [PATCH] util-lib: use FLAGS_SET() where appropriate --- src/basic/fs-util.c | 4 ++-- src/shared/bus-util.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c index 9f3fd45691..d1c06cf12a 100644 --- a/src/basic/fs-util.c +++ b/src/basic/fs-util.c @@ -1411,9 +1411,9 @@ int open_parent(const char *path, int flags, mode_t mode) { /* Let's insist on O_DIRECTORY since the parent of a file or directory is a directory. Except if we open an * O_TMPFILE file, because in that case we are actually create a regular file below the parent directory. */ - if ((flags & O_PATH) == O_PATH) + if (FLAGS_SET(flags, O_PATH)) flags |= O_DIRECTORY; - else if ((flags & O_TMPFILE) != O_TMPFILE) + else if (!FLAGS_SET(flags, O_TMPFILE)) flags |= O_DIRECTORY|O_RDONLY; fd = open(parent, flags, mode); diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index 1911dd0ce6..00120e9874 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -756,7 +756,7 @@ static int bus_print_property(const char *name, const char *expected_value, sd_b if ((u & NAMESPACE_FLAGS_ALL) == 0) result = "yes"; - else if ((u & NAMESPACE_FLAGS_ALL) == NAMESPACE_FLAGS_ALL) + else if (FLAGS_SET(u, NAMESPACE_FLAGS_ALL)) result = "no"; else { r = namespace_flags_to_string(u, &s);