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/in_set.cocci | |
parent | 7b943bb7e3e2fad3481c7191edbfaeef0680b196 (diff) | |
download | systemd-a2d61f07463410e8ef7127b6e7c194d2bb04247a.tar.gz |
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/in_set.cocci')
-rw-r--r-- | coccinelle/in_set.cocci | 59 |
1 files changed, 39 insertions, 20 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) |