diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-10-28 00:51:52 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-28 00:51:52 +0300 |
| commit | 220604042cb222019e7779287ab73615d7869376 (patch) | |
| tree | 046dd7f16674322480c142016aa164fbdfb3ecb0 /merge-ort.c | |
| parent | 99bb1a0bea02c6dc78b6d8a1b219c687d792bf16 (diff) | |
| parent | 4b992f0a24ad884eb43898cbb468fdf8fbe647bb (diff) | |
Merge branch 'jk/unused-anno-more'
More UNUSED annotation to help using -Wunused option with the
compiler.
* jk/unused-anno-more:
ll-merge: mark unused parameters in callbacks
diffcore-pickaxe: mark unused parameters in pickaxe functions
convert: mark unused parameter in null stream filter
apply: mark unused parameters in noop error/warning routine
apply: mark unused parameters in handlers
date: mark unused parameters in handler functions
string-list: mark unused callback parameters
object-file: mark unused parameters in hash_unknown functions
mark unused parameters in trivial compat functions
update-index: drop unused argc from do_reupdate()
submodule--helper: drop unused argc from module_list_compute()
diffstat_consume(): assert non-zero length
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-ort.c b/merge-ort.c index e5f41cce48..7e83ebfaa9 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -397,7 +397,7 @@ struct conflicted_submodule_item { int flag; }; -static void conflicted_submodule_item_free(void *util, const char *str) +static void conflicted_submodule_item_free(void *util, const char *str UNUSED) { struct conflicted_submodule_item *item = util; |