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 /builtin/ls-tree.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 'builtin/ls-tree.c')
-rw-r--r-- | builtin/ls-tree.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c index 48df337605..c3ea09281a 100644 --- a/builtin/ls-tree.c +++ b/builtin/ls-tree.c @@ -142,7 +142,7 @@ static int show_recursive(const char *base, size_t baselen, const char *pathname } static int show_tree_fmt(const struct object_id *oid, struct strbuf *base, - const char *pathname, unsigned mode, void *UNUSED(context)) + const char *pathname, unsigned mode, void *context UNUSED) { size_t baselen; int recurse = 0; @@ -213,7 +213,7 @@ static void show_tree_common_default_long(struct strbuf *base, static int show_tree_default(const struct object_id *oid, struct strbuf *base, const char *pathname, unsigned mode, - void *UNUSED(context)) + void *context UNUSED) { int early; int recurse; @@ -231,7 +231,7 @@ static int show_tree_default(const struct object_id *oid, struct strbuf *base, static int show_tree_long(const struct object_id *oid, struct strbuf *base, const char *pathname, unsigned mode, - void *UNUSED(context)) + void *context UNUSED) { int early; int recurse; @@ -261,7 +261,7 @@ static int show_tree_long(const struct object_id *oid, struct strbuf *base, static int show_tree_name_only(const struct object_id *oid, struct strbuf *base, const char *pathname, unsigned mode, - void *UNUSED(context)) + void *context UNUSED) { int early; int recurse; @@ -282,7 +282,7 @@ static int show_tree_name_only(const struct object_id *oid, struct strbuf *base, static int show_tree_object(const struct object_id *oid, struct strbuf *base, const char *pathname, unsigned mode, - void *UNUSED(context)) + void *context UNUSED) { int early; int recurse; |