summaryrefslogtreecommitdiff
path: root/walker.c
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2022-08-25 19:09:48 +0200
committerJunio C Hamano <gitster@pobox.com>2022-09-01 10:49:48 -0700
commit5cf88fd8b059235b21ee2f72b17bf1f421a9c4e7 (patch)
tree03de8d4160649a0b4c1dd79164d746206743f25d /walker.c
parent776515ef8b381d49caeccfe2e8da98cb666e257a (diff)
downloadgit-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 'walker.c')
-rw-r--r--walker.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/walker.c b/walker.c
index f945d021f8..99d0e0eae0 100644
--- a/walker.c
+++ b/walker.c
@@ -215,10 +215,10 @@ static int interpret_target(struct walker *walker, char *target, struct object_i
return -1;
}
-static int mark_complete(const char *UNUSED(path),
+static int mark_complete(const char *path UNUSED,
const struct object_id *oid,
- int UNUSED(flag),
- void *UNUSED(cb_data))
+ int flag UNUSED,
+ void *cb_data UNUSED)
{
struct commit *commit = lookup_commit_reference_gently(the_repository,
oid, 1);