diff options
| author |  Tay Ray Chuan <rctay89@gmail.com> | 2011-08-01 12:20:09 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-08-08 13:00:17 -0700 |
| commit | 43ca7530df839321cc4f62b54a0098f2a1cfb4ad (patch) | |
| tree | 59f33a20f653a3a809f3f78675b97018ed0d5674 /xdiff | |
| parent | xdiff/xhistogram: rework handling of recursed results (diff) | |
| download | tgif-43ca7530df839321cc4f62b54a0098f2a1cfb4ad.tar.xz | |
xdiff/xhistogram: rely on xdl_trim_ends()
Do away with reduce_common_start_end() and use xdf->dstart and xdf->dend
set by xdl_trim_ends() that similarly tells us where the first unmatched
line from the start and end occurs.
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff')
| -rw-r--r-- | xdiff/xhistogram.c | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c index 4cfafa1b3a..130ceeed88 100644 --- a/xdiff/xhistogram.c +++ b/xdiff/xhistogram.c @@ -102,7 +102,7 @@ static int cmp_recs(xpparam_t const *xpp, (cmp_recs(xpp, REC(env, s1, l1), REC(env, s2, l2))) #define CMP(i, s1, l1, s2, l2) \ - (CMP_ENV(i->xpp, i->env, s1, l1, s2, l2)) + (cmp_recs(i->xpp, 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) @@ -248,23 +248,6 @@ static int find_lcs(struct histindex *index, struct region *lcs, return index->has_common && index->max_chain_length < index->cnt; } -static void reduce_common_start_end(xpparam_t const *xpp, xdfenv_t *env, - int *line1, int *count1, int *line2, int *count2) -{ - if (*count1 <= 1 || *count2 <= 1) - return; - while (*count1 > 1 && *count2 > 1 && CMP_ENV(xpp, env, 1, *line1, 2, *line2)) { - (*line1)++; - (*count1)--; - (*line2)++; - (*count2)--; - } - while (*count1 > 1 && *count2 > 1 && CMP_ENV(xpp, env, 1, LINE_END_PTR(1), 2, LINE_END_PTR(2))) { - (*count1)--; - (*count2)--; - } -} - static int fall_back_to_classic_diff(struct histindex *index, int line1, int count1, int line2, int count2) { @@ -372,16 +355,10 @@ cleanup: int xdl_do_histogram_diff(mmfile_t *file1, mmfile_t *file2, xpparam_t const *xpp, xdfenv_t *env) { - int line1, line2, count1, count2; - if (xdl_prepare_env(file1, file2, xpp, env) < 0) return -1; - line1 = line2 = 1; - count1 = env->xdf1.nrec; - count2 = env->xdf2.nrec; - - reduce_common_start_end(xpp, env, &line1, &count1, &line2, &count2); - - return histogram_diff(xpp, env, line1, count1, line2, count2); + return histogram_diff(xpp, env, + env->xdf1.dstart + 1, env->xdf1.dend - env->xdf1.dstart + 1, + env->xdf2.dstart + 1, env->xdf2.dend - env->xdf2.dstart + 1); } |