mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-compat-util.h: use "UNUSED", not "UNUSED(var)"

Browse Source 
As reported in [1] the "UNUSED(var)" macro introduced in
2174b8c75de (Merge branch 'jk/unused-annotation' into next,
2022-08-24) breaks coccinelle's parsing of our sources in files where
it occurs.

Let's instead partially go with the approach suggested in [2] of
making this not take an argument. As noted in [1] "coccinelle" will
ignore such tokens in argument lists that it doesn't know about, and
it's less of a surprise to syntax highlighters.

This undoes the "help us notice when a parameter marked as unused is
actually use" part of 9b24034754 (git-compat-util: add UNUSED macro,
2022-08-19), a subsequent commit will further tweak the macro to
implement a replacement for that functionality.

1. https://lore.kernel.org/git/220825.86ilmg4mil.gmgdl@evledraar.gmail.com/
2. https://lore.kernel.org/git/220819.868rnk54ju.gmgdl@evledraar.gmail.com/

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2022-08-25 19:09:48 +02:00
committed by Junio C Hamano
parent 776515ef8b
commit 5cf88fd8b0
93 changed files with 269 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
object-name.c
View File

@ -1306,7 +1306,7 @@ struct handle_one_ref_cb {
};
static int handle_one_ref(const char *path, const struct object_id *oid,
int UNUSED(flag),
int flag UNUSED,
void *cb_data)
{
struct handle_one_ref_cb *cb = cb_data;
@ -1385,11 +1385,11 @@ struct grab_nth_branch_switch_cbdata {
struct strbuf *sb;
};
static int grab_nth_branch_switch(struct object_id *UNUSED(ooid),
struct object_id *UNUSED(noid),
const char *UNUSED(email),
timestamp_t UNUSED(timestamp),
int UNUSED(tz),
static int grab_nth_branch_switch(struct object_id *ooid UNUSED,
struct object_id *noid UNUSED,
const char *email UNUSED,
timestamp_t timestamp UNUSED,
int tz UNUSED,
const char *message, void *cb_data)
{
struct grab_nth_branch_switch_cbdata *cb = cb_data;