From 1ee347104576c8a2681edd79ed8328791f0677d2 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Mon, 17 Oct 2022 21:05:32 -0400 Subject: string-list: mark unused callback parameters String-lists may be used with callbacks for clearing or iteration. These callbacks need to conform to a particular interface, even though not every callback needs all of its parameters. Mark the unused ones to make -Wunused-parameter happy. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- merge-ort.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'merge-ort.c') diff --git a/merge-ort.c b/merge-ort.c index 99dcee2db8..3dc93e0f25 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -397,7 +397,7 @@ struct conflicted_submodule_item { int flag; }; -static void conflicted_submodule_item_free(void *util, const char *str) +static void conflicted_submodule_item_free(void *util, const char *str UNUSED) { struct conflicted_submodule_item *item = util; -- cgit v1.2.3