diff options
| author | Jeff King <peff@peff.net> | 2022-08-19 06:08:44 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-19 12:18:55 -0700 |
| commit | 783a86c1427637d71fb2710291e677360ab5dc09 (patch) | |
| tree | 6301e6737288ea790d91b41036d770f7648d4d56 /builtin | |
| parent | 9f5a9de7c83cac4bd6397eafaa6e39dad7a77032 (diff) | |
| download | git-783a86c1427637d71fb2710291e677360ab5dc09.tar.gz | |
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 'builtin')
| -rw-r--r-- | builtin/am.c | 2 | ||||
| -rw-r--r-- | builtin/commit-graph.c | 2 | ||||
| -rw-r--r-- | builtin/config.c | 8 | ||||
| -rw-r--r-- | builtin/multi-pack-index.c | 2 | ||||
| -rw-r--r-- | builtin/remote.c | 2 |
5 files changed, 9 insertions, 7 deletions
diff --git a/builtin/am.c b/builtin/am.c index 93bec62afa..0811b9ff67 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -2301,7 +2301,7 @@ static int parse_opt_show_current_patch(const struct option *opt, const char *ar return 0; } -static int git_am_config(const char *k, const char *v, void *cb) +static int git_am_config(const char *k, const char *v, void *UNUSED(cb)) { int status; diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index 51c4040ea6..ea923ea33a 100644 --- a/builtin/commit-graph.c +++ b/builtin/commit-graph.c @@ -179,7 +179,7 @@ static int write_option_max_new_filters(const struct option *opt, } static int git_commit_graph_write_config(const char *var, const char *value, - void *cb) + void *UNUSED(cb)) { if (!strcmp(var, "commitgraph.maxnewfilters")) write_opts.max_new_filters = git_config_int(var, value); diff --git a/builtin/config.c b/builtin/config.c index e7b88a9c08..bdc8b1d1a8 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -207,7 +207,8 @@ static void show_config_scope(struct strbuf *buf) strbuf_addch(buf, term); } -static int show_all_config(const char *key_, const char *value_, void *cb) +static int show_all_config(const char *key_, const char *value_, + void *UNUSED(cb)) { if (show_origin || show_scope) { struct strbuf buf = STRBUF_INIT; @@ -458,7 +459,8 @@ static const char *get_color_slot; static const char *get_colorbool_slot; static char parsed_color[COLOR_MAXLEN]; -static int git_get_color_config(const char *var, const char *value, void *cb) +static int git_get_color_config(const char *var, const char *value, + void *UNUSED(cb)) { if (!strcmp(var, get_color_slot)) { if (!value) @@ -490,7 +492,7 @@ static int get_colorbool_found; static int get_diff_color_found; static int get_color_ui_found; static int git_get_colorbool_config(const char *var, const char *value, - void *cb) + void *UNUSED(data)) { if (!strcmp(var, get_colorbool_slot)) get_colorbool_found = git_config_colorbool(var, value); diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c index 8f24d59a75..8d156766af 100644 --- a/builtin/multi-pack-index.c +++ b/builtin/multi-pack-index.c @@ -78,7 +78,7 @@ static struct option *add_common_options(struct option *prev) } static int git_multi_pack_index_write_config(const char *var, const char *value, - void *cb) + void *UNUSED(cb)) { if (!strcmp(var, "pack.writebitmaphashcache")) { if (git_config_bool(var, value)) diff --git a/builtin/remote.c b/builtin/remote.c index b390360f07..87dda7c37b 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -1486,7 +1486,7 @@ static int prune(int argc, const char **argv) return result; } -static int get_remote_default(const char *key, const char *value, void *priv) +static int get_remote_default(const char *key, const char *UNUSED(value), void *priv) { if (strcmp(key, "remotes.default") == 0) { int *found = priv; |