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 --- submodule.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'submodule.c') diff --git a/submodule.c b/submodule.c index 597a347f85..7455b618ea 100644 --- a/submodule.c +++ b/submodule.c @@ -214,7 +214,7 @@ void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt, /* Cheap function that only determines if we're interested in submodules at all */ int git_default_submodule_config(const char *var, const char *value, - void *UNUSED(cb)) + void *cb UNUSED) { if (!strcmp(var, "submodule.recurse")) { int v = git_config_bool(var, value) ? @@ -941,9 +941,9 @@ static void free_submodules_data(struct string_list *submodules) string_list_clear(submodules, 1); } -static int has_remote(const char *UNUSED(refname), - const struct object_id *UNUSED(oid), - int UNUSED(flags), void *UNUSED(cb_data)) +static int has_remote(const char *refname UNUSED, + const struct object_id *oid UNUSED, + int flags UNUSED, void *cb_data UNUSED) { return 1; } @@ -1245,9 +1245,9 @@ int push_unpushed_submodules(struct repository *r, return ret; } -static int append_oid_to_array(const char *UNUSED(ref), +static int append_oid_to_array(const char *ref UNUSED, const struct object_id *oid, - int UNUSED(flags), void *data) + int flags UNUSED, void *data) { struct oid_array *array = data; oid_array_append(array, oid); -- cgit v1.3