aboutsummaryrefslogtreecommitdiffstats
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-02-14 14:15:55 -0800
committerJunio C Hamano <gitster@pobox.com>2023-02-14 14:15:55 -0800
commit8d404d0d952ed0f09682c9651f82ce7e30eeb819 (patch)
tree24c30d713200829766dc3b692e8f4cf7608bdb04 /combine-diff.c
parentMerge branch 'rj/branch-copy-and-rename' into maint-2.39 (diff)
parentuserdiff: mark unused parameter in internal callback (diff)
downloadgit-8d404d0d952ed0f09682c9651f82ce7e30eeb819.tar.gz
git-8d404d0d952ed0f09682c9651f82ce7e30eeb819.zip
Merge branch 'jk/unused-post-2.39' into maint-2.39
Code clean-up around unused function parameters. * jk/unused-post-2.39: userdiff: mark unused parameter in internal callback list-objects-filter: mark unused parameters in virtual functions diff: mark unused parameters in callbacks xdiff: mark unused parameter in xdl_call_hunk_func() xdiff: drop unused parameter in def_ff() ws: drop unused parameter from ws_blank_line() list-objects: drop process_gitlink() function blob: drop unused parts of parse_blob_buffer() ls-refs: use repository parameter to iterate refs
Diffstat (limited to 'combine-diff.c')
-rw-r--r--combine-diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c
index b0ece95480..1a39b5dde0 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -372,7 +372,7 @@ struct combine_diff_state {
static void consume_hunk(void *state_,
long ob, long on,
long nb, long nn,
- const char *funcline, long funclen)
+ const char *func UNUSED, long funclen UNUSED)
{
struct combine_diff_state *state = state_;