From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 8 Feb 2018 23:08:28 +0000 (-0800)
Subject: Merge branch 'rs/cocci-strbuf-addf-to-addstr' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0016008a97d8bc818752d27034948a5ccbc6705b?hp=91e362b26ad2f85bdb9d82f78cc1111a028e261f

Merge branch 'rs/cocci-strbuf-addf-to-addstr' into next

* rs/cocci-strbuf-addf-to-addstr:
cocci: simplify check for trivial format strings
---

diff --git a/contrib/coccinelle/strbuf.cocci b/contrib/coccinelle/strbuf.cocci
index 6fe8727421..e34eada1ad 100644
--- a/contrib/coccinelle/strbuf.cocci
+++ b/contrib/coccinelle/strbuf.cocci
@@ -1,21 +1,6 @@
 @ strbuf_addf_with_format_only @
 expression E;
-constant fmt;
-@@
-  strbuf_addf(E,
-(
-  fmt
-|
-  _(fmt)
-)
-  );
-
-@ script:python @
-fmt << strbuf_addf_with_format_only.fmt;
-@@
-cocci.include_match("%" not in fmt)
-
-@ extends strbuf_addf_with_format_only @
+constant fmt !~ "%";
 @@
 - strbuf_addf
 + strbuf_addstr