tree-wide: formatting tweaks reported by Coccinelle

[thirdparty/systemd.git] / coccinelle / strempty.cocci

diff --git a/coccinelle/strempty.cocci b/coccinelle/strempty.cocci
index 7901da3652ce7bb4c9d023e2ffaf7cb84b15ac5d..0868184c5d41edbe101356b5188ccff639fd64f0 100644 (file)
--- a/coccinelle/strempty.cocci
+++ b/coccinelle/strempty.cocci
@@ -1,6 +1,18 @@
 @@
-/* Avoid running this transformation on the strempty function itself */
-position p : script:python() { p[0].current_element != "strempty" };
+/* Avoid running this transformation on the strempty function itself and
+ * on the "make_expression" macro in src/libsystemd/sd-bus/bus-convenience.c.
+ * As Coccinelle's Location object doesn't support macro "detection", use
+ * a pretty horrifying combo of specifying a file and a special "something_else"
+ * position element, which is, apparently, the default value of
+ * "current_element" before it's set (according to the source code), thus
+ * matching any "top level" position, including macros. Let's hope we never
+ * introduce a function called "something_else"...
+ */
+position p : script:python() {
+        not (p[0].current_element == "strempty" or
+                (p[0].file == "src/libsystemd/sd-bus/bus-convenience.c" and
+                        p[0].current_element == "something_else"))
+};
 expression s;
 @@
 (