diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-08-25 17:09:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-01 17:49:48 (GMT) |
| commit | 5cf88fd8b059235b21ee2f72b17bf1f421a9c4e7 (patch) | |
| tree | 03de8d4160649a0b4c1dd79164d746206743f25d /builtin/bisect--helper.c | |
| parent | 776515ef8b381d49caeccfe2e8da98cb666e257a (diff) | |
| download | git-5cf88fd8b059235b21ee2f72b17bf1f421a9c4e7.zip git-5cf88fd8b059235b21ee2f72b17bf1f421a9c4e7.tar.gz git-5cf88fd8b059235b21ee2f72b17bf1f421a9c4e7.tar.bz2 | |
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 'builtin/bisect--helper.c')
| -rw-r--r-- | builtin/bisect--helper.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index 87c8b2d..aa975bd 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -329,9 +329,9 @@ static int check_and_set_terms(struct bisect_terms *terms, const char *cmd) return 0; } -static int inc_nr(const char *UNUSED(refname), - const struct object_id *UNUSED(oid), - int UNUSED(flag), void *cb_data) +static int inc_nr(const char *refname UNUSED, + const struct object_id *oid UNUSED, + int flag UNUSED, void *cb_data) { unsigned int *nr = (unsigned int *)cb_data; (*nr)++; @@ -519,7 +519,7 @@ finish: } static int add_bisect_ref(const char *refname, const struct object_id *oid, - int UNUSED(flags), void *cb) + int flags UNUSED, void *cb) { struct add_bisect_ref_data *data = cb; @@ -1135,9 +1135,9 @@ static int bisect_visualize(struct bisect_terms *terms, const char **argv, int a return res; } -static int get_first_good(const char *UNUSED(refname), +static int get_first_good(const char *refname UNUSED, const struct object_id *oid, - int UNUSED(flag), void *cb_data) + int flag UNUSED, void *cb_data) { oidcpy(cb_data, oid); return 1; |