diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-09-14 22:56:38 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-09-14 22:56:39 +0300 |
commit | a6b42ec0c6e2ef492b0ed6d1f1123dc7e724154e (patch) | |
tree | ee3cd1f07f639913c04501f6562a7bbc9b4ad4b8 /builtin/difftool.c | |
parent | e188ec3a735ae52a0d0d3c22f9df6b29fa613b1e (diff) | |
parent | 776515ef8b381d49caeccfe2e8da98cb666e257a (diff) |
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/difftool.c')
-rw-r--r-- | builtin/difftool.c | 10 |
1 files changed, 5 insertions, 5 deletions
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) |