diff options
| -rw-r--r-- | coccinelle/in_set.cocci | 59 | ||||
| -rw-r--r-- | coccinelle/not_in_set.cocci | 127 | ||||
| -rw-r--r-- | src/udev/udevd.c | 2 |
3 files changed, 57 insertions, 131 deletions
diff --git a/coccinelle/in_set.cocci b/coccinelle/in_set.cocci index f5ddd3d334..12d5475fd9 100644 --- a/coccinelle/in_set.cocci +++ b/coccinelle/in_set.cocci @@ -1,35 +1,54 @@ @@ expression e; -identifier n1, n2, n3, n4, n5, n6; -statement s; +constant n0, n1, n2, n3, n4, n5, n6, n7, n8, n9; @@ -- e == n1 || e == n2 || e == n3 || e == n4 || e == n5 || e == n6 -+ IN_SET(e, n1, n2, n3, n4, n5, n6) +- e == n0 || e == n1 || e == n2 || e == n3 || e == n4 || e == n5 || e == n6 || e == n7 || e == n8 || e == n9 ++ IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9) @@ expression e; -identifier n1, n2, n3, n4, n5; -statement s; +constant n0, n1, n2, n3, n4, n5, n6, n7, n8; @@ -- e == n1 || e == n2 || e == n3 || e == n4 || e == n5 -+ IN_SET(e, n1, n2, n3, n4, n5) +- e == n0 || e == n1 || e == n2 || e == n3 || e == n4 || e == n5 || e == n6 || e == n7 || e == n8 ++ IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8) @@ expression e; -identifier n1, n2, n3, n4; -statement s; +constant n0, n1, n2, n3, n4, n5, n6, n7; @@ -- e == n1 || e == n2 || e == n3 || e == n4 -+ IN_SET(e, n1, n2, n3, n4) +- e == n0 || e == n1 || e == n2 || e == n3 || e == n4 || e == n5 || e == n6 || e == n7 ++ IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7) @@ expression e; -identifier n1, n2, n3; -statement s; +constant n0, n1, n2, n3, n4, n5, n6; @@ -- e == n1 || e == n2 || e == n3 -+ IN_SET(e, n1, n2, n3) +- e == n0 || e == n1 || e == n2 || e == n3 || e == n4 || e == n5 || e == n6 ++ IN_SET(e, n0, n1, n2, n3, n4, n5, n6) @@ expression e; -identifier n, p; -statement s; +constant n0, n1, n2, n3, n4, n5; @@ -- e == n || e == p -+ IN_SET(e, n, p) +- e == n0 || e == n1 || e == n2 || e == n3 || e == n4 || e == n5 ++ IN_SET(e, n0, n1, n2, n3, n4, n5) +@@ +expression e; +constant n0, n1, n2, n3, n4; +@@ +- e == n0 || e == n1 || e == n2 || e == n3 || e == n4 ++ IN_SET(e, n0, n1, n2, n3, n4) +@@ +expression e; +constant n0, n1, n2, n3; +@@ +- e == n0 || e == n1 || e == n2 || e == n3 ++ IN_SET(e, n0, n1, n2, n3) +@@ +expression e; +constant n0, n1, n2; +@@ +- e == n0 || e == n1 || e == n2 ++ IN_SET(e, n0, n1, n2) +@@ +expression e; +constant n0, n1; +@@ +- e == n0 || e == n1 ++ IN_SET(e, n0, n1) diff --git a/coccinelle/not_in_set.cocci b/coccinelle/not_in_set.cocci index e6bcf47893..7cf98500cd 100644 --- a/coccinelle/not_in_set.cocci +++ b/coccinelle/not_in_set.cocci @@ -1,147 +1,54 @@ @@ expression e; -identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16, n17, n18, n19, n20; -statement s; -@@ -- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 && e != n12 && e != n13 && e != n14 && e != n15 && e != n16 && e != n17 && e != n18 && e != n19 && e != n20 -+ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16, n17, n18, n19, n20) -@@ -expression e; -identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16, n17, n18, n19; -statement s; -@@ -- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 && e != n12 && e != n13 && e != n14 && e != n15 && e != n16 && e != n17 && e != n18 && e != n19 -+ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16, n17, n18, n19) -@@ -expression e; -identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16, n17, n18; -statement s; -@@ -- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 && e != n12 && e != n13 && e != n14 && e != n15 && e != n16 && e != n17 && e != n18 -+ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16, n17, n18) -@@ -expression e; -identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16, n17; -statement s; -@@ -- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 && e != n12 && e != n13 && e != n14 && e != n15 && e != n16 && e != n17 -+ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16, n17) -@@ -expression e; -identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16; -statement s; -@@ -- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 && e != n12 && e != n13 && e != n14 && e != n15 && e != n16 -+ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16) -@@ -expression e; -identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15; -statement s; -@@ -- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 && e != n12 && e != n13 && e != n14 && e != n15 -+ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15) -@@ -expression e; -identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14; -statement s; -@@ -- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 && e != n12 && e != n13 && e != n14 -+ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14) -@@ -expression e; -identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13; -statement s; -@@ -- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 && e != n12 && e != n13 -+ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13) -@@ -expression e; -identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12; -statement s; -@@ -- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 && e != n12 -+ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12) -@@ -expression e; -identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11; -statement s; -@@ -- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 -+ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11) -@@ -expression e; -identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10; -statement s; -@@ -- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 -+ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10) -@@ -expression e; -identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9; -statement s; +constant n0, n1, n2, n3, n4, n5, n6, n7, n8, n9; @@ - e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 + !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9) @@ expression e; -identifier n0, n1, n2, n3, n4, n5, n6, n7, n8; -statement s; +constant n0, n1, n2, n3, n4, n5, n6, n7, n8; @@ - e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 + !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8) @@ expression e; -identifier n0, n1, n2, n3, n4, n5, n6, n7; -statement s; +constant n0, n1, n2, n3, n4, n5, n6, n7; @@ - e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 + !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7) @@ expression e; -identifier n0, n1, n2, n3, n4, n5, n6; -statement s; +constant n0, n1, n2, n3, n4, n5, n6; @@ - e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 + !IN_SET(e, n0, n1, n2, n3, n4, n5, n6) @@ expression e; -identifier n0, n1, n2, n3, n4, n5; -statement s; +constant n0, n1, n2, n3, n4, n5; @@ - e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 + !IN_SET(e, n0, n1, n2, n3, n4, n5) @@ expression e; -identifier n1, n2, n3, n4, n5; -statement s; -@@ -- e != n1 && e != n2 && e != n3 && e != n4 && e != n5 -+ !IN_SET(e, n1, n2, n3, n4, n5) -@@ -expression e; -identifier n1, n2, n3, n4; -statement s; +constant n0, n1, n2, n3, n4; @@ -- e != n1 && e != n2 && e != n3 && e != n4 -+ !IN_SET(e, n1, n2, n3, n4) +- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 ++ !IN_SET(e, n0, n1, n2, n3, n4) @@ expression e; -identifier n1, n2, n3, n4; -statement s; +constant n0, n1, n2, n3; @@ -- e != n1 && e != n2 && e != n3 && e != n4 -+ !IN_SET(e, n1, n2, n3, n4) +- e != n0 && e != n1 && e != n2 && e != n3 ++ !IN_SET(e, n0, n1, n2, n3) @@ expression e; -identifier n1, n2, n3; -statement s; +constant n0, n1, n2; @@ -- e != n1 && e != n2 && e != n3 -+ !IN_SET(e, n1, n2, n3) +- e != n0 && e != n1 && e != n2 ++ !IN_SET(e, n0, n1, n2) @@ expression e; -identifier n, p; -statement s; +constant n0, n1; @@ -- e != n && e != p -+ !IN_SET(e, n, p) +- e != n0 && e != n1 ++ !IN_SET(e, n0, n1) diff --git a/src/udev/udevd.c b/src/udev/udevd.c index be76857454..e2c7f99cd4 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -1715,7 +1715,7 @@ int main(int argc, char *argv[]) { by PID1. otherwise we are not guaranteed to have a dedicated cgroup */ r = cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, 0, &cgroup); if (r < 0) { - if (r == -ENOENT || r == -ENOMEDIUM) + if (IN_SET(r, -ENOENT, -ENOMEDIUM)) log_debug_errno(r, "did not find dedicated cgroup: %m"); else log_warning_errno(r, "failed to get cgroup: %m"); |