aboutsummaryrefslogtreecommitdiffstats
path: root/builtin
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
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')
-rw-r--r--builtin/am.c2
-rw-r--r--builtin/bisect--helper.c12
-rw-r--r--builtin/checkout.c4
-rw-r--r--builtin/commit-graph.c2
-rw-r--r--builtin/config.c8
-rw-r--r--builtin/describe.c5
-rw-r--r--builtin/difftool.c10
-rw-r--r--builtin/fast-export.c2
-rw-r--r--builtin/fast-import.c2
-rw-r--r--builtin/fetch.c9
-rw-r--r--builtin/fsck.c12
-rw-r--r--builtin/gc.c5
-rw-r--r--builtin/log.c7
-rw-r--r--builtin/ls-tree.c13
-rw-r--r--builtin/multi-pack-index.c2
-rw-r--r--builtin/name-rev.c3
-rw-r--r--builtin/pack-objects.c12
-rw-r--r--builtin/receive-pack.c4
-rw-r--r--builtin/reflog.c3
-rw-r--r--builtin/remote.c14
-rw-r--r--builtin/repack.c4
-rw-r--r--builtin/rev-parse.c6
-rw-r--r--builtin/show-branch.c6
-rw-r--r--builtin/show-ref.c7
-rw-r--r--builtin/stash.c9
-rw-r--r--builtin/submodule--helper.c5
26 files changed, 98 insertions, 70 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/bisect--helper.c b/builtin/bisect--helper.c
index 7097750fc6..2bdbad48e9 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -329,8 +329,9 @@ static int check_and_set_terms(struct bisect_terms *terms, const char *cmd)
return 0;
}
-static int inc_nr(const char *refname, const struct object_id *oid,
- int flag, void *cb_data)
+static int inc_nr(const char *UNUSED(refname),
+ const struct object_id *UNUSED(oid),
+ int UNUSED(flag), void *cb_data)
{
unsigned int *nr = (unsigned int *)cb_data;
(*nr)++;
@@ -518,7 +519,7 @@ finish:
}
static int add_bisect_ref(const char *refname, const struct object_id *oid,
- int flags, void *cb)
+ int UNUSED(flags), void *cb)
{
struct add_bisect_ref_data *data = cb;
@@ -1134,8 +1135,9 @@ static int bisect_visualize(struct bisect_terms *terms, const char **argv, int a
return res;
}
-static int get_first_good(const char *refname, const struct object_id *oid,
- int flag, void *cb_data)
+static int get_first_good(const char *UNUSED(refname),
+ const struct object_id *oid,
+ int UNUSED(flag), void *cb_data)
{
oidcpy(cb_data, oid);
return 1;
diff --git a/builtin/checkout.c b/builtin/checkout.c
index f9d63d80b9..d18c8c886e 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -125,7 +125,7 @@ static int post_checkout_hook(struct commit *old_commit, struct commit *new_comm
}
static int update_some(const struct object_id *oid, struct strbuf *base,
- const char *pathname, unsigned mode, void *context)
+ const char *pathname, unsigned mode, void *UNUSED(context))
{
int len;
struct cache_entry *ce;
@@ -990,7 +990,7 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
static int add_pending_uninteresting_ref(const char *refname,
const struct object_id *oid,
- int flags, void *cb_data)
+ int UNUSED(flags), void *cb_data)
{
add_pending_oid(cb_data, refname, oid, UNINTERESTING);
return 0;
diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
index dc3cc35394..6e3baff6d5 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/describe.c b/builtin/describe.c
index a76f1a1a7a..084fa00f2a 100644
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -63,7 +63,7 @@ static const char *prio_names[] = {
N_("head"), N_("lightweight"), N_("annotated"),
};
-static int commit_name_neq(const void *unused_cmp_data,
+static int commit_name_neq(const void *UNUSED(cmp_data),
const struct hashmap_entry *eptr,
const struct hashmap_entry *entry_or_key,
const void *peeled)
@@ -140,7 +140,8 @@ static void add_to_known_names(const char *path,
}
}
-static int get_name(const char *path, const struct object_id *oid, int flag, void *cb_data)
+static int get_name(const char *path, const struct object_id *oid,
+ int UNUSED(flag), void *UNUSED(cb_data))
{
int is_tag = 0;
struct object_id peeled;
diff --git a/builtin/difftool.c b/builtin/difftool.c
index 8706f68492..d1f973c481 100644
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -125,10 +125,10 @@ struct working_tree_entry {
char path[FLEX_ARRAY];
};
-static int working_tree_entry_cmp(const void *unused_cmp_data,
+static int working_tree_entry_cmp(const void *UNUSED(cmp_data),
const struct hashmap_entry *eptr,
const struct hashmap_entry *entry_or_key,
- const void *unused_keydata)
+ const void *UNUSED(keydata))
{
const struct working_tree_entry *a, *b;
@@ -148,10 +148,10 @@ struct pair_entry {
const char path[FLEX_ARRAY];
};
-static int pair_cmp(const void *unused_cmp_data,
+static int pair_cmp(const void *UNUSED(cmp_data),
const struct hashmap_entry *eptr,
const struct hashmap_entry *entry_or_key,
- const void *unused_keydata)
+ const void *UNUSED(keydata))
{
const struct pair_entry *a, *b;
@@ -184,7 +184,7 @@ struct path_entry {
char path[FLEX_ARRAY];
};
-static int path_entry_cmp(const void *unused_cmp_data,
+static int path_entry_cmp(const void *UNUSED(cmp_data),
const struct hashmap_entry *eptr,
const struct hashmap_entry *entry_or_key,
const void *key)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index bf3c20dea2..6aa2761ee9 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -119,7 +119,7 @@ struct anonymized_entry_key {
size_t orig_len;
};
-static int anonymized_entry_cmp(const void *unused_cmp_data,
+static int anonymized_entry_cmp(const void *UNUSED(cmp_data),
const struct hashmap_entry *eptr,
const struct hashmap_entry *entry_or_key,
const void *keydata)
diff --git a/builtin/fast-import.c b/builtin/fast-import.c
index 14113cfd82..76ed0c2db9 100644
--- a/builtin/fast-import.c
+++ b/builtin/fast-import.c
@@ -46,7 +46,7 @@ struct object_entry {
depth : DEPTH_BITS;
};
-static int object_entry_hashcmp(const void *map_data,
+static int object_entry_hashcmp(const void *UNUSED(map_data),
const struct hashmap_entry *eptr,
const struct hashmap_entry *entry_or_key,
const void *keydata)
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 368a0f5329..a07692599c 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -301,7 +301,7 @@ struct refname_hash_entry {
char refname[FLEX_ARRAY];
};
-static int refname_hash_entry_cmp(const void *hashmap_cmp_fn_data,
+static int refname_hash_entry_cmp(const void *UNUSED(hashmap_cmp_fn_data),
const struct hashmap_entry *eptr,
const struct hashmap_entry *entry_or_key,
const void *keydata)
@@ -329,7 +329,7 @@ static struct refname_hash_entry *refname_hash_add(struct hashmap *map,
static int add_one_refname(const char *refname,
const struct object_id *oid,
- int flag, void *cbdata)
+ int UNUSED(flag), void *cbdata)
{
struct hashmap *refname_map = cbdata;
@@ -1464,8 +1464,9 @@ static void set_option(struct transport *transport, const char *name, const char
}
-static int add_oid(const char *refname, const struct object_id *oid, int flags,
- void *cb_data)
+static int add_oid(const char *UNUSED(refname),
+ const struct object_id *oid,
+ int UNUSED(flags), void *cb_data)
{
struct oid_array *oids = cb_data;
diff --git a/builtin/fsck.c b/builtin/fsck.c
index 6c73092f10..31d3da8954 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -488,8 +488,9 @@ static void fsck_handle_reflog_oid(const char *refname, struct object_id *oid,
}
static int fsck_handle_reflog_ent(struct object_id *ooid, struct object_id *noid,
- const char *email, timestamp_t timestamp, int tz,
- const char *message, void *cb_data)
+ const char *UNUSED(email),
+ timestamp_t timestamp, int UNUSED(tz),
+ const char *UNUSED(message), void *cb_data)
{
const char *refname = cb_data;
@@ -502,8 +503,9 @@ static int fsck_handle_reflog_ent(struct object_id *ooid, struct object_id *noid
return 0;
}
-static int fsck_handle_reflog(const char *logname, const struct object_id *oid,
- int flag, void *cb_data)
+static int fsck_handle_reflog(const char *logname,
+ const struct object_id *UNUSED(oid),
+ int UNUSED(flag), void *cb_data)
{
struct strbuf refname = STRBUF_INIT;
@@ -514,7 +516,7 @@ static int fsck_handle_reflog(const char *logname, const struct object_id *oid,
}
static int fsck_handle_ref(const char *refname, const struct object_id *oid,
- int flag, void *cb_data)
+ int UNUSED(flag), void *UNUSED(cb_data))
{
struct object *obj;
diff --git a/builtin/gc.c b/builtin/gc.c
index 48eeb2d260..c3c2780c2e 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -782,8 +782,9 @@ struct cg_auto_data {
int limit;
};
-static int dfs_on_ref(const char *refname,
- const struct object_id *oid, int flags,
+static int dfs_on_ref(const char *UNUSED(refname),
+ const struct object_id *oid,
+ int UNUSED(flags),
void *cb_data)
{
struct cg_auto_data *data = (struct cg_auto_data *)cb_data;
diff --git a/builtin/log.c b/builtin/log.c
index 047f9e5278..0a3f2fca28 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -698,9 +698,10 @@ static int show_tag_object(const struct object_id *oid, struct rev_info *rev)
return 0;
}
-static int show_tree_object(const struct object_id *oid,
- struct strbuf *base,
- const char *pathname, unsigned mode, void *context)
+static int show_tree_object(const struct object_id *UNUSED(oid),
+ struct strbuf *UNUSED(base),
+ const char *pathname, unsigned mode,
+ void *context)
{
FILE *file = context;
fprintf(file, "%s%s\n", pathname, S_ISDIR(mode) ? "/" : "");
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index e279be8bb6..48df337605 100644
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -142,7 +142,7 @@ static int show_recursive(const char *base, size_t baselen, const char *pathname
}
static int show_tree_fmt(const struct object_id *oid, struct strbuf *base,
- const char *pathname, unsigned mode, void *context)
+ const char *pathname, unsigned mode, void *UNUSED(context))
{
size_t baselen;
int recurse = 0;
@@ -213,7 +213,7 @@ static void show_tree_common_default_long(struct strbuf *base,
static int show_tree_default(const struct object_id *oid, struct strbuf *base,
const char *pathname, unsigned mode,
- void *context)
+ void *UNUSED(context))
{
int early;
int recurse;
@@ -230,7 +230,8 @@ static int show_tree_default(const struct object_id *oid, struct strbuf *base,
}
static int show_tree_long(const struct object_id *oid, struct strbuf *base,
- const char *pathname, unsigned mode, void *context)
+ const char *pathname, unsigned mode,
+ void *UNUSED(context))
{
int early;
int recurse;
@@ -259,7 +260,8 @@ static int show_tree_long(const struct object_id *oid, struct strbuf *base,
}
static int show_tree_name_only(const struct object_id *oid, struct strbuf *base,
- const char *pathname, unsigned mode, void *context)
+ const char *pathname, unsigned mode,
+ void *UNUSED(context))
{
int early;
int recurse;
@@ -279,7 +281,8 @@ static int show_tree_name_only(const struct object_id *oid, struct strbuf *base,
}
static int show_tree_object(const struct object_id *oid, struct strbuf *base,
- const char *pathname, unsigned mode, void *context)
+ const char *pathname, unsigned mode,
+ void *UNUSED(context))
{
int early;
int recurse;
diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c
index 3bfad9149d..f1b1c77741 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/name-rev.c b/builtin/name-rev.c
index 580b1eb170..c4dc143c4b 100644
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@ -344,7 +344,8 @@ static int cmp_by_tag_and_age(const void *a_, const void *b_)
return a->taggerdate != b->taggerdate;
}
-static int name_ref(const char *path, const struct object_id *oid, int flags, void *cb_data)
+static int name_ref(const char *path, const struct object_id *oid,
+ int UNUSED(flags), void *cb_data)
{
struct object *o = parse_object(the_repository, oid);
struct name_ref_data *data = cb_data;
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 46e2677496..bf3df7200f 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -759,8 +759,8 @@ static enum write_one_status write_one(struct hashfile *f,
return WRITE_ONE_WRITTEN;
}
-static int mark_tagged(const char *path, const struct object_id *oid, int flag,
- void *cb_data)
+static int mark_tagged(const char *UNUSED(path), const struct object_id *oid,
+ int UNUSED(flag), void *UNUSED(cb_data))
{
struct object_id peeled;
struct object_entry *entry = packlist_find(&to_pack, oid);
@@ -3035,7 +3035,8 @@ static void add_tag_chain(const struct object_id *oid)
}
}
-static int add_ref_tag(const char *tag, const struct object_id *oid, int flag, void *cb_data)
+static int add_ref_tag(const char *UNUSED(tag), const struct object_id *oid,
+ int UNUSED(flag), void *UNUSED(cb_data))
{
struct object_id peeled;
@@ -3958,8 +3959,9 @@ static void record_recent_commit(struct commit *commit, void *data)
}
static int mark_bitmap_preferred_tip(const char *refname,
- const struct object_id *oid, int flags,
- void *_data)
+ const struct object_id *oid,
+ int UNUSED(flags),
+ void *UNUSED(data))
{
struct object_id peeled;
struct object *object;
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 31b48e728b..6882d526e6 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -291,7 +291,7 @@ static void show_ref(const char *path, const struct object_id *oid)
}
static int show_ref_cb(const char *path_full, const struct object_id *oid,
- int flag, void *data)
+ int UNUSED(flag), void *data)
{
struct oidset *seen = data;
const char *path = strip_namespace(path_full);
@@ -465,7 +465,7 @@ static void rp_error(const char *err, ...)
va_end(params);
}
-static int copy_to_sideband(int in, int out, void *arg)
+static int copy_to_sideband(int in, int UNUSED(out), void *UNUSED(arg))
{
char data[128];
int keepalive_active = 0;
diff --git a/builtin/reflog.c b/builtin/reflog.c
index 461c94f1b2..22c5b6b28c 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -56,7 +56,8 @@ struct worktree_reflogs {
struct string_list reflogs;
};
-static int collect_reflog(const char *ref, const struct object_id *oid, int unused, void *cb_data)
+static int collect_reflog(const char *ref, const struct object_id *UNUSED(oid),
+ int UNUSED(flags), void *cb_data)
{
struct worktree_reflogs *cb = cb_data;
struct worktree *worktree = cb->worktree;
diff --git a/builtin/remote.c b/builtin/remote.c
index 07117e4c9a..3bde8cc760 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -264,7 +264,8 @@ static const char *abbrev_ref(const char *name, const char *prefix)
}
#define abbrev_branch(name) abbrev_ref((name), "refs/heads/")
-static int config_read_branches(const char *key, const char *value, void *cb)
+static int config_read_branches(const char *key, const char *value,
+ void *UNUSED(data))
{
const char *orig_key = key;
char *name;
@@ -538,7 +539,8 @@ struct branches_for_remote {
};
static int add_branch_for_removal(const char *refname,
- const struct object_id *oid, int flags, void *cb_data)
+ const struct object_id *UNUSED(oid),
+ int UNUSED(flags), void *cb_data)
{
struct branches_for_remote *branches = cb_data;
struct refspec_item refspec;
@@ -580,7 +582,8 @@ struct rename_info {
};
static int read_remote_branches(const char *refname,
- const struct object_id *oid, int flags, void *cb_data)
+ const struct object_id *UNUSED(oid),
+ int UNUSED(flags), void *cb_data)
{
struct rename_info *rename = cb_data;
struct strbuf buf = STRBUF_INIT;
@@ -955,7 +958,8 @@ static void free_remote_ref_states(struct ref_states *states)
}
static int append_ref_to_tracked_list(const char *refname,
- const struct object_id *oid, int flags, void *cb_data)
+ const struct object_id *UNUSED(oid),
+ int flags, void *cb_data)
{
struct ref_states *states = cb_data;
struct refspec_item refspec;
@@ -1485,7 +1489,7 @@ static int prune(int argc, const char **argv, const char *prefix)
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;
diff --git a/builtin/repack.c b/builtin/repack.c
index 482b66f57d..ff952dec48 100644
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -514,9 +514,9 @@ struct midx_snapshot_ref_data {
int preferred;
};
-static int midx_snapshot_ref_one(const char *refname,
+static int midx_snapshot_ref_one(const char *UNUSED(refname),
const struct object_id *oid,
- int flag, void *_data)
+ int UNUSED(flag), void *_data)
{
struct midx_snapshot_ref_data *data = _data;
struct object_id peeled;
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 85c271acd7..1310f9cec1 100644
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -195,7 +195,8 @@ static int show_default(void)
return 0;
}
-static int show_reference(const char *refname, const struct object_id *oid, int flag, void *cb_data)
+static int show_reference(const char *refname, const struct object_id *oid,
+ int UNUSED(flag), void *UNUSED(cb_data))
{
if (ref_excluded(ref_excludes, refname))
return 0;
@@ -203,7 +204,8 @@ static int show_reference(const char *refname, const struct object_id *oid, int
return 0;
}
-static int anti_reference(const char *refname, const struct object_id *oid, int flag, void *cb_data)
+static int anti_reference(const char *refname, const struct object_id *oid,
+ int UNUSED(flag), void *UNUSED(cb_data))
{
show_rev(REVERSED, oid, refname);
return 0;
diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 64c649c6a2..3ec011bea4 100644
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -404,7 +404,7 @@ static int append_ref(const char *refname, const struct object_id *oid,
}
static int append_head_ref(const char *refname, const struct object_id *oid,
- int flag, void *cb_data)
+ int UNUSED(flag), void *UNUSED(cb_data))
{
struct object_id tmp;
int ofs = 11;
@@ -419,7 +419,7 @@ static int append_head_ref(const char *refname, const struct object_id *oid,
}
static int append_remote_ref(const char *refname, const struct object_id *oid,
- int flag, void *cb_data)
+ int UNUSED(flag), void *UNUSED(cb_data))
{
struct object_id tmp;
int ofs = 13;
@@ -434,7 +434,7 @@ static int append_remote_ref(const char *refname, const struct object_id *oid,
}
static int append_tag_ref(const char *refname, const struct object_id *oid,
- int flag, void *cb_data)
+ int UNUSED(flag), void *UNUSED(cb_data))
{
if (!starts_with(refname, "refs/tags/"))
return 0;
diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index 5fa207a044..9746537220 100644
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -47,7 +47,7 @@ static void show_one(const char *refname, const struct object_id *oid)
}
static int show_ref(const char *refname, const struct object_id *oid,
- int flag, void *cbdata)
+ int UNUSED(flag), void *UNUSED(cbdata))
{
if (show_head && !strcmp(refname, "HEAD"))
goto match;
@@ -77,8 +77,9 @@ match:
return 0;
}
-static int add_existing(const char *refname, const struct object_id *oid,
- int flag, void *cbdata)
+static int add_existing(const char *refname,
+ const struct object_id *UNUSED(oid),
+ int UNUSED(flag), void *cbdata)
{
struct string_list *list = (struct string_list *)cbdata;
string_list_insert(list, refname);
diff --git a/builtin/stash.c b/builtin/stash.c
index 1ba24c1173..932c6173cf 100644
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -638,9 +638,12 @@ cleanup:
return ret;
}
-static int reject_reflog_ent(struct object_id *ooid, struct object_id *noid,
- const char *email, timestamp_t timestamp, int tz,
- const char *message, void *cb_data)
+static int reject_reflog_ent(struct object_id *UNUSED(ooid),
+ struct object_id *UNUSED(noid),
+ const char *UNUSED(email),
+ timestamp_t UNUSED(timestamp),
+ int UNUSED(tz), const char *UNUSED(message),
+ void *UNUSED(cb_data))
{
return 1;
}
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index c4149f11e7..72e38351ea 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -573,8 +573,9 @@ static void print_status(unsigned int flags, char state, const char *path,
printf("\n");
}
-static int handle_submodule_head_ref(const char *refname,
- const struct object_id *oid, int flags,
+static int handle_submodule_head_ref(const char *UNUSED(refname),
+ const struct object_id *oid,
+ int UNUSED(flags),
void *cb_data)
{
struct object_id *output = cb_data;