mirror of
https://github.com/git/git
synced 2024-07-07 19:39:27 +00:00
340a4cb25c
The <id> in the <rulename> part of the coccinelle syntax[1] is for our purposes there to declares if we have inter-dependencies between different rules. But such <id>'s must be unique within a given semantic patch file. As we'll be processing a concatenated version of our rules in the subsequent commit let's remove these names. They weren't being used for the semantic patches themselves, and equated to a short comment about the rule. Both the filename and context of the rules makes it clear what they're doing, so we're not gaining anything from keeping these. Retaining them goes against recommendations that "contrib/coccinelle/README" will be making in the subsequent commit. This leaves only one named rule in our sources, where it's needed for a "<id> <-> <extends> <id>" relationship: $ git -P grep '^@ ' -- contrib/coccinelle/ contrib/coccinelle/swap.cocci:@ swap @ contrib/coccinelle/swap.cocci:@ extends swap @ 1. https://coccinelle.gitlabpages.inria.fr/website/docs/main_grammar.html Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Taylor Blau <me@ttaylorr.com>
63 lines
843 B
Plaintext
63 lines
843 B
Plaintext
@@
|
|
expression E;
|
|
constant fmt !~ "%";
|
|
@@
|
|
- strbuf_addf
|
|
+ strbuf_addstr
|
|
(E,
|
|
(
|
|
fmt
|
|
|
|
|
_(fmt)
|
|
)
|
|
);
|
|
|
|
@@
|
|
expression E;
|
|
struct strbuf SB;
|
|
format F =~ "^s$";
|
|
@@
|
|
- strbuf_addf(E, "%@F@", SB.buf);
|
|
+ strbuf_addbuf(E, &SB);
|
|
|
|
@@
|
|
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;
|
|
format F =~ "^s$";
|
|
@@
|
|
- strbuf_addf(E1, "%@F@", E2);
|
|
+ strbuf_addstr(E1, E2);
|
|
|
|
@@
|
|
expression E1, E2, E3;
|
|
@@
|
|
- strbuf_addstr(E1, find_unique_abbrev(E2, E3));
|
|
+ strbuf_add_unique_abbrev(E1, E2, E3);
|
|
|
|
@@
|
|
expression E1, E2;
|
|
@@
|
|
- strbuf_addstr(E1, real_path(E2));
|
|
+ strbuf_add_real_path(E1, E2);
|