diff options
author | Jeff King <peff@peff.net> | 2022-08-19 13:08:44 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-08-19 22:18:55 +0300 |
commit | 783a86c1427637d71fb2710291e677360ab5dc09 (patch) | |
tree | 6301e6737288ea790d91b41036d770f7648d4d56 /ll-merge.c | |
parent | 9f5a9de7c83cac4bd6397eafaa6e39dad7a77032 (diff) |
config: mark unused callback parameters
The callback passed to git_config() must conform to a particular
interface. But most callbacks don't actually look at the extra "void
*data" parameter. Let's mark the unused parameters to make
-Wunused-parameter happy.
Note there's one unusual case here in get_remote_default() where we
actually ignore the "value" parameter. That's because it's only checking
whether the option is found at all, and not parsing its value.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.c')
-rw-r--r-- | ll-merge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ll-merge.c b/ll-merge.c index 14b8362019..9f3ae1f8fe 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -249,7 +249,8 @@ static enum ll_merge_result ll_ext_merge(const struct ll_merge_driver *fn, static struct ll_merge_driver *ll_user_merge, **ll_user_merge_tail; static const char *default_ll_merge; -static int read_merge_config(const char *var, const char *value, void *cb) +static int read_merge_config(const char *var, const char *value, + void *UNUSED(cb)) { struct ll_merge_driver *fn; const char *key, *name; |