aboutsummaryrefslogtreecommitdiffstats
path: root/remote.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 /remote.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 'remote.c')
-rw-r--r--remote.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/remote.c b/remote.c
index 618ad5a0f1..ef12aba91d 100644
--- a/remote.c
+++ b/remote.c
@@ -86,7 +86,7 @@ struct remotes_hash_key {
int len;
};
-static int remotes_hash_cmp(const void *unused_cmp_data,
+static int remotes_hash_cmp(const void *UNUSED(cmp_data),
const struct hashmap_entry *eptr,
const struct hashmap_entry *entry_or_key,
const void *keydata)
@@ -170,7 +170,7 @@ struct branches_hash_key {
int len;
};
-static int branches_hash_cmp(const void *unused_cmp_data,
+static int branches_hash_cmp(const void *UNUSED(cmp_data),
const struct hashmap_entry *eptr,
const struct hashmap_entry *entry_or_key,
const void *keydata)
@@ -2320,7 +2320,8 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb,
}
static int one_local_ref(const char *refname, const struct object_id *oid,
- int flag, void *cb_data)
+ int UNUSED(flag),
+ void *cb_data)
{
struct ref ***local_tail = cb_data;
struct ref *ref;
@@ -2576,19 +2577,22 @@ struct check_and_collect_until_cb_data {
};
/* Get the timestamp of the latest entry. */
-static int peek_reflog(struct object_id *o_oid, struct object_id *n_oid,
- const char *ident, timestamp_t timestamp,
- int tz, const char *message, void *cb_data)
+static int peek_reflog(struct object_id *UNUSED(o_oid),
+ struct object_id *UNUSED(n_oid),
+ const char *UNUSED(ident),
+ timestamp_t timestamp, int UNUSED(tz),
+ const char *UNUSED(message), void *cb_data)
{
timestamp_t *ts = cb_data;
*ts = timestamp;
return 1;
}
-static int check_and_collect_until(struct object_id *o_oid,
+static int check_and_collect_until(struct object_id *UNUSED(o_oid),
struct object_id *n_oid,
- const char *ident, timestamp_t timestamp,
- int tz, const char *message, void *cb_data)
+ const char *UNUSED(ident),
+ timestamp_t timestamp, int UNUSED(tz),
+ const char *UNUSED(message), void *cb_data)
{
struct commit *commit;
struct check_and_collect_until_cb_data *cb = cb_data;