diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-08-25 19:09:48 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-01 10:49:48 -0700 |
| commit | 5cf88fd8b059235b21ee2f72b17bf1f421a9c4e7 (patch) | |
| tree | 03de8d4160649a0b4c1dd79164d746206743f25d /fetch-pack.c | |
| parent | 776515ef8b381d49caeccfe2e8da98cb666e257a (diff) | |
| download | git-5cf88fd8b059235b21ee2f72b17bf1f421a9c4e7.tar.gz | |
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 9b240347543 (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>
Diffstat (limited to 'fetch-pack.c')
| -rw-r--r-- | fetch-pack.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fetch-pack.c b/fetch-pack.c index 9f2933e868..633718099b 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -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; |