diff options
| author | Jeff King <peff@peff.net> | 2022-10-18 04:05:32 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-18 07:24:04 +0300 |
| commit | 1ee347104576c8a2681edd79ed8328791f0677d2 (patch) | |
| tree | 550d2854f0b1e0467f435d12cdf6d0d3423cdf93 /merge-ort.c | |
| parent | 9eb6cdadd155f93ff25c674050f218d3f21a5e82 (diff) | |
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |