From 5cf88fd8b059235b21ee2f72b17bf1f421a9c4e7 Mon Sep 17 00:00:00 2001 From: Ævar Arnfjörð Bjarmason Date: Thu, 25 Aug 2022 19:09:48 +0200 Subject: git-compat-util.h: use "UNUSED", not "UNUSED(var)" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Junio C Hamano --- shallow.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'shallow.c') diff --git a/shallow.c b/shallow.c index 71ab04f935..17f9bcdb5f 100644 --- a/shallow.c +++ b/shallow.c @@ -604,10 +604,10 @@ static void paint_down(struct paint_info *info, const struct object_id *oid, free(tmp); } -static int mark_uninteresting(const char *UNUSED(refname), +static int mark_uninteresting(const char *refname UNUSED, const struct object_id *oid, - int UNUSED(flags), - void *UNUSED(cb_data)) + int flags UNUSED, + void *cb_data UNUSED) { struct commit *commit = lookup_commit_reference_gently(the_repository, oid, 1); @@ -717,9 +717,9 @@ struct commit_array { int nr, alloc; }; -static int add_ref(const char *UNUSED(refname), +static int add_ref(const char *refname UNUSED, const struct object_id *oid, - int UNUSED(flags), + int flags UNUSED, void *cb_data) { struct commit_array *ca = cb_data; -- cgit v1.3-5-g9baa