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 19:49:48 +0200 |
| commit | 5cf88fd8b059235b21ee2f72b17bf1f421a9c4e7 (patch) | |
| tree | 03de8d4160649a0b4c1dd79164d746206743f25d /archive-zip.c | |
| parent | is_path_owned_by_current_uid(): mark "report" parameter as unused (diff) | |
| download | git-5cf88fd8b059235b21ee2f72b17bf1f421a9c4e7.tar.xz git-5cf88fd8b059235b21ee2f72b17bf1f421a9c4e7.zip | |
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 'archive-zip.c')
| -rw-r--r-- | archive-zip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/archive-zip.c b/archive-zip.c index d63782dc31..0456f1ebf1 100644 --- a/archive-zip.c +++ b/archive-zip.c @@ -613,12 +613,12 @@ static void dos_time(timestamp_t *timestamp, int *dos_date, int *dos_time) } static int archive_zip_config(const char *var, const char *value, - void *UNUSED(data)) + void *data UNUSED) { return userdiff_config(var, value); } -static int write_zip_archive(const struct archiver *UNUSED(ar), +static int write_zip_archive(const struct archiver *ar UNUSED, struct archiver_args *args) { int err; |