Flush fixes up to the third batch post 2.22.0

diff --git a/contrib/coccinelle/strbuf.cocci b/contrib/coccinelle/strbuf.cocci
index 6fe8727421101efc04c15d8c6def448984eff74d..d9ada69b4323f2e9611aa6add5b21a77e622a7c8 100644 (file)
--- a/contrib/coccinelle/strbuf.cocci
+++ b/contrib/coccinelle/strbuf.cocci
@@ -1,8 +1,10 @@
 @ strbuf_addf_with_format_only @
 expression E;
-constant fmt;
+constant fmt !~ "%";
 @@
-  strbuf_addf(E,
+- strbuf_addf
++ strbuf_addstr
+  (E,
 (
   fmt
 |
@@ -10,22 +12,35 @@ constant fmt;
 )
   );
 
-@ script:python @
-fmt << strbuf_addf_with_format_only.fmt;
 @@
-cocci.include_match("%" not in fmt)
+expression E;
+struct strbuf SB;
+format F =~ "s";
+@@
+- strbuf_addf(E, "%@F@", SB.buf);
++ strbuf_addbuf(E, &SB);
 
-@ extends strbuf_addf_with_format_only @
 @@
-- strbuf_addf
-+ strbuf_addstr
-  (E,
-(
-  fmt
-|
-  _(fmt)
-)
-  );
+expression E;
+struct strbuf *SBP;
+format F =~ "s";
+@@
+- strbuf_addf(E, "%@F@", SBP->buf);
++ strbuf_addbuf(E, SBP);
+
+@@
+expression E;
+struct strbuf SB;
+@@
+- strbuf_addstr(E, SB.buf);
++ strbuf_addbuf(E, &SB);
+
+@@
+expression E;
+struct strbuf *SBP;
+@@
+- strbuf_addstr(E, SBP->buf);
++ strbuf_addbuf(E, SBP);
 
 @@
 expression E1, E2;