git-compat-util.h: use "UNUSED", not "UNUSED(var)"
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:

committed by
Junio C Hamano

parent
776515ef8b
commit
5cf88fd8b0
@ -301,7 +301,7 @@ struct refname_hash_entry {
|
||||
char refname[FLEX_ARRAY];
|
||||
};
|
||||
|
||||
static int refname_hash_entry_cmp(const void *UNUSED(hashmap_cmp_fn_data),
|
||||
static int refname_hash_entry_cmp(const void *hashmap_cmp_fn_data UNUSED,
|
||||
const struct hashmap_entry *eptr,
|
||||
const struct hashmap_entry *entry_or_key,
|
||||
const void *keydata)
|
||||
@ -329,7 +329,7 @@ static struct refname_hash_entry *refname_hash_add(struct hashmap *map,
|
||||
|
||||
static int add_one_refname(const char *refname,
|
||||
const struct object_id *oid,
|
||||
int UNUSED(flag), void *cbdata)
|
||||
int flag UNUSED, void *cbdata)
|
||||
{
|
||||
struct hashmap *refname_map = cbdata;
|
||||
|
||||
@ -1462,9 +1462,9 @@ static void set_option(struct transport *transport, const char *name, const char
|
||||
}
|
||||
|
||||
|
||||
static int add_oid(const char *UNUSED(refname),
|
||||
static int add_oid(const char *refname UNUSED,
|
||||
const struct object_id *oid,
|
||||
int UNUSED(flags), void *cb_data)
|
||||
int flags UNUSED, void *cb_data)
|
||||
{
|
||||
struct oid_array *oids = cb_data;
|
||||
|
||||
|
Reference in New Issue
Block a user