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
fetch-pack.c
View File

@ -176,9 +176,9 @@ static int rev_list_insert_ref(struct fetch_negotiator *negotiator,
return 0;
}
static int rev_list_insert_ref_oid(const char *UNUSED(refname),
static int rev_list_insert_ref_oid(const char *refname UNUSED,
const struct object_id *oid,
int UNUSED(flag),
int flag UNUSED,
void *cb_data)
{
return rev_list_insert_ref(cb_data, oid);
@ -582,10 +582,10 @@ static int mark_complete(const struct object_id *oid)
return 0;
}
static int mark_complete_oid(const char *UNUSED(refname),
static int mark_complete_oid(const char *refname UNUSED,
const struct object_id *oid,
int UNUSED(flag),
void *UNUSED(cb_data))
int flag UNUSED,
void *cb_data UNUSED)
{
return mark_complete(oid);
}
@ -823,7 +823,7 @@ static int everything_local(struct fetch_pack_args *args,
return retval;
}
static int sideband_demux(int UNUSED(in), int out, void *data)
static int sideband_demux(int in UNUSED, int out, void *data)
{
int *xd = data;
int ret;