SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9176 from keszybz/flags-set

Browse Source 
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
14 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/cgroup.c
+1 -1
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);
src/core/unit.c
+3 -3
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;