summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--coccinelle/flags-set.cocci3
-rwxr-xr-xcoccinelle/run-coccinelle.sh1
-rw-r--r--coccinelle/strjoina.cocci3
3 files changed, 5 insertions, 2 deletions
diff --git a/coccinelle/flags-set.cocci b/coccinelle/flags-set.cocci
index f6cc8ba68a..22620f1849 100644
--- a/coccinelle/flags-set.cocci
+++ b/coccinelle/flags-set.cocci
@@ -8,7 +8,8 @@ position p : script:python() {
p[0].current_element == "log_set_max_level_realm" or
p[0].current_element == "unichar_is_valid")
};
-expression x, y;
+expression x;
+constant y;
@@
(
- ((x@p) & (y)) == (y)
diff --git a/coccinelle/run-coccinelle.sh b/coccinelle/run-coccinelle.sh
index 871547a881..d1af412acc 100755
--- a/coccinelle/run-coccinelle.sh
+++ b/coccinelle/run-coccinelle.sh
@@ -7,6 +7,7 @@ EXCLUDED_PATHS=(
"src/basic/linux/*"
# Symlinked to test-bus-vtable-cc.cc, which causes issues with the IN_SET macro
"src/libsystemd/sd-bus/test-bus-vtable.c"
+ "src/libsystemd/sd-journal/lookup3.c"
)
top="$(git rev-parse --show-toplevel)"
diff --git a/coccinelle/strjoina.cocci b/coccinelle/strjoina.cocci
index a6236eb0f9..b209633480 100644
--- a/coccinelle/strjoina.cocci
+++ b/coccinelle/strjoina.cocci
@@ -1,6 +1,7 @@
@@
+position p : script:python() { p[0].current_element != "test_strjoina" };
expression n, m;
expression list s;
@@
-- n = strjoina(m, s, NULL);
+- n = strjoina@p(m, s, NULL);
+ n = strjoina(m, s);