summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2021-12-03 05:11:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-12-05 07:27:53 (GMT)
commit25449450c0d07dfd490906c5114f67452aa18de8 (patch)
tree7c5681cadffbedede3703df5ccc0d378d275c05c
parentcf0b26d90c93ce0a600ed094107b5f1a611750e9 (diff)
downloadgit-25449450c0d07dfd490906c5114f67452aa18de8.zip
git-25449450c0d07dfd490906c5114f67452aa18de8.tar.gz
git-25449450c0d07dfd490906c5114f67452aa18de8.tar.bz2
xdiff: drop xpparam_t parameter from histogram cmp_recs()
Since 663c5ad035 (diff histogram: intern strings, 2021-11-17), our cmp_recs() does not call xdl_recmatch(), and thus no longer needs an xpparam_t struct from which to get the flags. We can drop the unused parameter from the function, as well as the macro which wraps it. There's no functional change here; it's just simplifying things (and making -Wunused-parameter happier). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--xdiff/xhistogram.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c
index 399cc23..8079474 100644
--- a/xdiff/xhistogram.c
+++ b/xdiff/xhistogram.c
@@ -88,15 +88,14 @@ struct region {
#define REC(env, s, l) \
(env->xdf##s.recs[l - 1])
-static int cmp_recs(xpparam_t const *xpp,
- xrecord_t *r1, xrecord_t *r2)
+static int cmp_recs(xrecord_t *r1, xrecord_t *r2)
{
return r1->ha == r2->ha;
}
#define CMP(i, s1, l1, s2, l2) \
- (cmp_recs(i->xpp, REC(i->env, s1, l1), REC(i->env, s2, l2)))
+ (cmp_recs(REC(i->env, s1, l1), REC(i->env, s2, l2)))
#define TABLE_HASH(index, side, line) \
XDL_HASHLONG((REC(index->env, side, line))->ha, index->table_bits)