From 5cf88fd8b059235b21ee2f72b17bf1f421a9c4e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= 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 --- negotiator/default.c | 4 ++-- negotiator/skipping.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'negotiator') diff --git a/negotiator/default.c b/negotiator/default.c index 10f0a46e62..b7e79feaf0 100644 --- a/negotiator/default.c +++ b/negotiator/default.c @@ -36,8 +36,8 @@ static void rev_list_push(struct negotiation_state *ns, } static int clear_marks(const char *refname, const struct object_id *oid, - int UNUSED(flag), - void *UNUSED(cb_data)) + int flag UNUSED, + void *cb_data UNUSED) { struct object *o = deref_tag(the_repository, parse_object(the_repository, oid), refname, 0); diff --git a/negotiator/skipping.c b/negotiator/skipping.c index f2aa58af92..c4398f5ae1 100644 --- a/negotiator/skipping.c +++ b/negotiator/skipping.c @@ -72,8 +72,8 @@ static struct entry *rev_list_push(struct data *data, struct commit *commit, int } static int clear_marks(const char *refname, const struct object_id *oid, - int UNUSED(flag), - void *UNUSED(cb_data)) + int flag UNUSED, + void *cb_data UNUSED) { struct object *o = deref_tag(the_repository, parse_object(the_repository, oid), refname, 0); -- cgit v1.2.3