diff options
author | Lennart Poettering <lennart@poettering.net> | 2017-11-29 13:05:24 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2017-11-29 20:12:26 +0100 |
commit | a2d61f07463410e8ef7127b6e7c194d2bb04247a (patch) | |
tree | 530f824adf7ddd298c01fbd588e13764bd44517f /coccinelle/not_in_set.cocci | |
parent | tree-wide: use strv_isempty() instead of strv_length() == 0 (diff) | |
download | systemd-a2d61f07463410e8ef7127b6e7c194d2bb04247a.tar.xz systemd-a2d61f07463410e8ef7127b6e7c194d2bb04247a.zip |
coccinelle: fix IN_SET/!IN_SET scripts, and apply some changes it found
IN_SET only works for constant values, hence clarify that. Moreover, we
declared a statement "s" we never made use of. Drop it.
Also, for both scripts, let's support 10 items. More causes spatch to
die with "Stack overflow" for me.
Diffstat (limited to 'coccinelle/not_in_set.cocci')
-rw-r--r-- | coccinelle/not_in_set.cocci | 127 |
1 files changed, 17 insertions, 110 deletions
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) |