diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-08-25 20:09:48 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-09-01 20:49:48 +0300 |
commit | 5cf88fd8b059235b21ee2f72b17bf1f421a9c4e7 (patch) | |
tree | 03de8d4160649a0b4c1dd79164d746206743f25d /builtin/config.c | |
parent | 776515ef8b381d49caeccfe2e8da98cb666e257a (diff) |
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/config.c')
-rw-r--r-- | builtin/config.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/config.c b/builtin/config.c index bdc8b1d1a8..753e5fac29 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -208,7 +208,7 @@ static void show_config_scope(struct strbuf *buf) } static int show_all_config(const char *key_, const char *value_, - void *UNUSED(cb)) + void *cb UNUSED) { if (show_origin || show_scope) { struct strbuf buf = STRBUF_INIT; @@ -460,7 +460,7 @@ static const char *get_colorbool_slot; static char parsed_color[COLOR_MAXLEN]; static int git_get_color_config(const char *var, const char *value, - void *UNUSED(cb)) + void *cb UNUSED) { if (!strcmp(var, get_color_slot)) { if (!value) @@ -492,7 +492,7 @@ static int get_colorbool_found; static int get_diff_color_found; static int get_color_ui_found; static int git_get_colorbool_config(const char *var, const char *value, - void *UNUSED(data)) + void *data UNUSED) { if (!strcmp(var, get_colorbool_slot)) get_colorbool_found = git_config_colorbool(var, value); |