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
builtin/pack-objects.c
View File

@ -759,8 +759,8 @@ static enum write_one_status write_one(struct hashfile *f,
return WRITE_ONE_WRITTEN;
}
static int mark_tagged(const char *UNUSED(path), const struct object_id *oid,
int UNUSED(flag), void *UNUSED(cb_data))
static int mark_tagged(const char *path UNUSED, const struct object_id *oid,
int flag UNUSED, void *cb_data UNUSED)
{
struct object_id peeled;
struct object_entry *entry = packlist_find(&to_pack, oid);
@ -3035,8 +3035,8 @@ static void add_tag_chain(const struct object_id *oid)
}
}
static int add_ref_tag(const char *UNUSED(tag), const struct object_id *oid,
int UNUSED(flag), void *UNUSED(cb_data))
static int add_ref_tag(const char *tag UNUSED, const struct object_id *oid,
int flag UNUSED, void *cb_data UNUSED)
{
struct object_id peeled;
@ -3952,8 +3952,8 @@ static void record_recent_commit(struct commit *commit, void *data)
static int mark_bitmap_preferred_tip(const char *refname,
const struct object_id *oid,
int UNUSED(flags),
void *UNUSED(data))
int flags UNUSED,
void *data UNUSED)
{
struct object_id peeled;
struct object *object;