path: root/contrib/coccinelle/strbuf.cocci
diff options
authorRené Scharfe <>2018-01-19 17:05:59 (GMT)
committerJunio C Hamano <>2018-01-19 19:27:14 (GMT)
commitcd9a4b6d9339ec81575e1af13c10bfcbba45a22f (patch)
treed06880e74ab0b1016e6406da1a2ae74d5e8091d5 /contrib/coccinelle/strbuf.cocci
parentfc849d8d6b90e5c1e0c37bc0d60dd92b2fe7347f (diff)
cocci: use format keyword instead of a literal string
There's a rule in strbuf.cocci for converting trivial uses of strbuf_addf() to strbuf_addstr() in order to simplify the code and improve performance a bit. Coccinelle 1.0.0~rc19.deb-3 on Travis CI lets the "%s" in that rule match format strings like "%d" as well for some reason, though, leading to invalid proposed patches. Use the "format" keyword to let Coccinelle parse the format string and match the conversion specifier with a trivial regular expression instead. This works fine with both Coccinelle 1.0.0~rc19.deb-3 and 1.0.4.deb-3+b3 (the current version on Debian testing). Reported-by: SZEDER Gábor <> Tested-by: SZEDER Gábor <> Signed-off-by: Rene Scharfe <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'contrib/coccinelle/strbuf.cocci')
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/coccinelle/strbuf.cocci b/contrib/coccinelle/strbuf.cocci
index 1d580e4..6fe8727 100644
--- a/contrib/coccinelle/strbuf.cocci
+++ b/contrib/coccinelle/strbuf.cocci
@@ -29,8 +29,9 @@ cocci.include_match("%" not in fmt)
expression E1, E2;
+format F =~ "s";
-- strbuf_addf(E1, "%s", E2);
+- strbuf_addf(E1, "%@F@", E2);
+ strbuf_addstr(E1, E2);