summaryrefslogtreecommitdiff
path: root/src/basic/rm-rf.c
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-04-20 15:36:20 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-06-04 11:50:44 +0200
commitd94a24ca2ea769755beaed0659b966b1ec75c8d4 (patch)
treee809995a39930fbc317fecc96e403c13f76737f0 /src/basic/rm-rf.c
parent00bfe67f6b178056bffcfa9fbfb04ca3fa809989 (diff)
downloadsystemd-d94a24ca2ea769755beaed0659b966b1ec75c8d4.tar.gz
Add macro for checking if some flags are set
This way we don't need to repeat the argument twice. I didn't replace all instances. I think it's better to leave out: - asserts - comparisons like x & y == x, which are mathematically equivalent, but here we aren't checking if flags are set, but if the argument fits in the flags.
Diffstat (limited to 'src/basic/rm-rf.c')
-rw-r--r--src/basic/rm-rf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/basic/rm-rf.c b/src/basic/rm-rf.c
index 91474ad95c..20f094b9a1 100644
--- a/src/basic/rm-rf.c
+++ b/src/basic/rm-rf.c
@@ -178,7 +178,7 @@ int rm_rf(const char *path, RemoveFlags flags) {
return -EPERM;
}
- if ((flags & (REMOVE_SUBVOLUME|REMOVE_ROOT|REMOVE_PHYSICAL)) == (REMOVE_SUBVOLUME|REMOVE_ROOT|REMOVE_PHYSICAL)) {
+ if (FLAGS_SET(flags, REMOVE_SUBVOLUME | REMOVE_ROOT | REMOVE_PHYSICAL)) {
/* Try to remove as subvolume first */
r = btrfs_subvol_remove(path, BTRFS_REMOVE_RECURSIVE|BTRFS_REMOVE_QUOTA);
if (r >= 0)