picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9176 from keszybz/flags-set 

Macro to check if flags are set
This commit is contained in:
Lennart Poettering 2018-06-04 13:45:29 +02:00 committed by GitHub
parent b5b74e4b12 5c270a18da
commit 4055a62faf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
coccinelle/flags-set.cocci Normal file
View File

@ -0,0 +1,15 @@
@@
expression x, y;
@@
- ((x) & (y)) == (y)
+ FLAGS_SET(x, y)
@@
expression x, y;
@@
- (x & (y)) == (y)
+ FLAGS_SET(x, y)
@@
expression x, y;
@@
- ((x) & y) == y
+ FLAGS_SET(x, y)

15
coccinelle/run-coccinelle.sh
View File

@ -1,9 +1,20 @@
#!/bin/bash -e
for SCRIPT in ${@-*.cocci} ; do
files="$(git ls-files ':/*.[ch]')"
args=
case "$1" in
-i)
args="$args --in-place"
shift
;;
esac
for SCRIPT in ${@-coccinelle/*.cocci} ; do
echo "--x-- Processing $SCRIPT --x--"
TMPFILE=`mktemp`
( set -x ; spatch --sp-file $SCRIPT --dir $PWD/.. 2> "$TMPFILE" || cat "$TMPFILE" )
echo "+ spatch --sp-file $SCRIPT $args ..."
spatch --sp-file $SCRIPT $args $files 2>"$TMPFILE" || cat "$TMPFILE"
rm "$TMPFILE"
echo -e "--x-- Processed $SCRIPT --x--\n"
done

2
src/basic/capability-util.h
View File

@ -41,7 +41,7 @@ static inline void cap_free_charpp(char **p) {
static inline bool cap_test_all(uint64_t caps) {
uint64_t m;
m = (UINT64_C(1) << (cap_last_cap() + 1)) - 1;
return (caps & m) == m;
return FLAGS_SET(caps, m);
}
bool ambient_capabilities_supported(void);

2
src/basic/copy.c
View File

@ -81,7 +81,7 @@ static int fd_is_nonblock_pipe(int fd) {
if (flags < 0)
return -errno;
return (flags & O_NONBLOCK) == O_NONBLOCK ? FD_IS_NONBLOCKING_PIPE : FD_IS_BLOCKING_PIPE;
return FLAGS_SET(flags, O_NONBLOCK) ? FD_IS_NONBLOCKING_PIPE : FD_IS_BLOCKING_PIPE;
}
int copy_bytes_full(

4
src/basic/fs-util.c
View File

@ -602,10 +602,10 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags,
assert(path);
/* Either the file may be missing, or we return an fd to the final object, but both make no sense */
if ((flags & (CHASE_NONEXISTENT|CHASE_OPEN)) == (CHASE_NONEXISTENT|CHASE_OPEN))
if (FLAGS_SET(flags, CHASE_NONEXISTENT | CHASE_OPEN))
return -EINVAL;
if ((flags & (CHASE_STEP|CHASE_OPEN)) == (CHASE_STEP|CHASE_OPEN))
if (FLAGS_SET(flags, CHASE_STEP | CHASE_OPEN))
return -EINVAL;
if (isempty(path))

2
src/basic/macro.h
View File

@ -357,6 +357,8 @@ static inline unsigned long ALIGN_POWER2(unsigned long u) {
#define SET_FLAG(v, flag, b) \
(v) = (b) ? ((v) | (flag)) : ((v) & ~(flag))
#define FLAGS_SET(v, flags) \
(((v) & (flags)) == (flags))
#define CASE_F(X) case X:
#define CASE_F_1(CASE, X) CASE_F(X)

6
src/basic/path-util.c
View File

@ -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);

2
src/basic/process-util.c
View File

@ -1359,7 +1359,7 @@ int safe_fork_full(
}
}
if ((flags & (FORK_NEW_MOUNTNS|FORK_MOUNTNS_SLAVE)) == (FORK_NEW_MOUNTNS|FORK_MOUNTNS_SLAVE)) {
if (FLAGS_SET(flags, FORK_NEW_MOUNTNS | FORK_MOUNTNS_SLAVE)) {
/* Optionally, make sure we never propagate mounts to the host. */

2
src/basic/rm-rf.c
View File

@ -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)

2
src/core/cgroup.c
View File

@ -1303,7 +1303,7 @@ const char *unit_get_realized_cgroup_path(Unit *u, CGroupMask mask) {
if (u->cgroup_path &&
u->cgroup_realized &&
(u->cgroup_realized_mask & mask) == mask)
FLAGS_SET(u->cgroup_realized_mask, mask))
return u->cgroup_path;
u = UNIT_DEREF(u->slice);

6
src/core/unit.c
View File

@ -1053,7 +1053,7 @@ static void print_unit_dependency_mask(FILE *f, const char *kind, UnitDependency
if (mask == 0)
break;
if ((mask & table[i].mask) == table[i].mask) {
if (FLAGS_SET(mask, table[i].mask)) {
if (*space)
fputc(' ', f);
else
@ -2695,8 +2695,8 @@ static int unit_add_dependency_hashmap(
if (info.data) {
/* Entry already exists. Add in our mask. */
if ((info.origin_mask & origin_mask) == info.origin_mask &&
(info.destination_mask & destination_mask) == info.destination_mask)
if (FLAGS_SET(origin_mask, info.origin_mask) &&
FLAGS_SET(destination_mask, info.destination_mask))
return 0; /* NOP */
info.origin_mask |= origin_mask;

2
src/import/curl-util.c
View File

@ -37,7 +37,7 @@ static int curl_glue_on_io(sd_event_source *s, int fd, uint32_t revents, void *u
translated_fd = PTR_TO_FD(hashmap_get(g->translate_fds, FD_TO_PTR(fd)));
if ((revents & (EPOLLIN|EPOLLOUT)) == (EPOLLIN|EPOLLOUT))
if (FLAGS_SET(revents, EPOLLIN | EPOLLOUT))
action = CURL_POLL_INOUT;
else if (revents & EPOLLIN)
action = CURL_POLL_IN;

2
src/shared/condition.c
View File

@ -251,7 +251,7 @@ static int condition_test_control_group_controller(Condition *c) {
return 1;
}
return (system_mask & wanted_mask) == wanted_mask;
return FLAGS_SET(system_mask, wanted_mask);
}
static int condition_test_group(Condition *c) {

2
src/udev/udev-builtin-input_id.c
View File

@ -307,7 +307,7 @@ static bool test_key(struct udev_device *dev,
/* the first 32 bits are ESC, numbers, and Q to D; if we have all of
* those, consider it a full keyboard; do not test KEY_RESERVED, though */
mask = 0xFFFFFFFE;
if ((bitmask_key[0] & mask) == mask) {
if (FLAGS_SET(bitmask_key[0], mask)) {
udev_builtin_add_property(dev, test, "ID_INPUT_KEYBOARD", "1");
ret = true;
}