aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-09-14 12:56:38 -0700
committerJunio C Hamano <gitster@pobox.com>2022-09-14 12:56:39 -0700
commita6b42ec0c6e2ef492b0ed6d1f1123dc7e724154e (patch)
treeee3cd1f07f639913c04501f6562a7bbc9b4ad4b8 /builtin/config.c
parente188ec3a735ae52a0d0d3c22f9df6b29fa613b1e (diff)
parent776515ef8b381d49caeccfe2e8da98cb666e257a (diff)
downloadgit-a6b42ec0c6e2ef492b0ed6d1f1123dc7e724154e.tar.gz
Merge branch 'jk/unused-annotation'
Annotate function parameters that are not used (but cannot be removed for structural reasons), to prepare us to later compile with -Wunused warning turned on. * jk/unused-annotation: is_path_owned_by_current_uid(): mark "report" parameter as unused run-command: mark unused async callback parameters mark unused read_tree_recursive() callback parameters hashmap: mark unused callback parameters config: mark unused callback parameters streaming: mark unused virtual method parameters transport: mark bundle transport_options as unused refs: mark unused virtual method parameters refs: mark unused reflog callback parameters refs: mark unused each_ref_fn parameters git-compat-util: add UNUSED macro
Diffstat (limited to 'builtin/config.c')
-rw-r--r--builtin/config.c8
1 files changed, 5 insertions, 3 deletions
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);