diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-09-14 21:56:38 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-09-14 21:56:39 +0200 |
commit | a6b42ec0c6e2ef492b0ed6d1f1123dc7e724154e (patch) | |
tree | ee3cd1f07f639913c04501f6562a7bbc9b4ad4b8 /diff.c | |
parent | Sync with 'maint' (diff) | |
parent | is_path_owned_by_current_uid(): mark "report" parameter as unused (diff) | |
download | git-a6b42ec0c6e2ef492b0ed6d1f1123dc7e724154e.tar.xz git-a6b42ec0c6e2ef492b0ed6d1f1123dc7e724154e.zip |
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 'diff.c')
-rw-r--r-- | diff.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -264,7 +264,8 @@ void init_diff_ui_defaults(void) diff_detect_rename_default = DIFF_DETECT_RENAME; } -int git_diff_heuristic_config(const char *var, const char *value, void *cb) +int git_diff_heuristic_config(const char *var, const char *value, + void *UNUSED(cb)) { if (!strcmp(var, "diff.indentheuristic")) diff_indent_heuristic = git_config_bool(var, value); @@ -916,7 +917,7 @@ struct interned_diff_symbol { static int interned_diff_symbol_cmp(const void *hashmap_cmp_fn_data, const struct hashmap_entry *eptr, const struct hashmap_entry *entry_or_key, - const void *keydata) + const void *UNUSED(keydata)) { const struct diff_options *diffopt = hashmap_cmp_fn_data; const struct emitted_diff_symbol *a, *b; |