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 --- refs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'refs.c') diff --git a/refs.c b/refs.c index 5012bba357..b1b3077ecc 100644 --- a/refs.c +++ b/refs.c @@ -359,7 +359,7 @@ struct warn_if_dangling_data { }; static int warn_if_dangling_symref(const char *refname, - const struct object_id *UNUSED(oid), + const struct object_id *oid UNUSED, int flags, void *cb_data) { struct warn_if_dangling_data *d = cb_data; @@ -894,7 +894,7 @@ static void set_read_ref_cutoffs(struct read_ref_at_cb *cb, } static int read_ref_at_ent(struct object_id *ooid, struct object_id *noid, - const char *UNUSED(email), + const char *email UNUSED, timestamp_t timestamp, int tz, const char *message, void *cb_data) { @@ -936,9 +936,9 @@ static int read_ref_at_ent(struct object_id *ooid, struct object_id *noid, return cb->found_it; } -static int read_ref_at_ent_newest(struct object_id *UNUSED(ooid), +static int read_ref_at_ent_newest(struct object_id *ooid UNUSED, struct object_id *noid, - const char *UNUSED(email), + const char *email UNUSED, timestamp_t timestamp, int tz, const char *message, void *cb_data) { @@ -951,7 +951,7 @@ static int read_ref_at_ent_newest(struct object_id *UNUSED(ooid), } static int read_ref_at_ent_oldest(struct object_id *ooid, struct object_id *noid, - const char *UNUSED(email), + const char *email UNUSED, timestamp_t timestamp, int tz, const char *message, void *cb_data) { @@ -1815,7 +1815,7 @@ struct ref_store_hash_entry char name[FLEX_ARRAY]; }; -static int ref_store_hash_cmp(const void *UNUSED(cmp_data), +static int ref_store_hash_cmp(const void *cmp_data UNUSED, const struct hashmap_entry *eptr, const struct hashmap_entry *entry_or_key, const void *keydata) -- cgit v1.2.3