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>
Tay Ray Chuan committed
Aug 1, 2011 at 12:20 UTC
43ca7530df839321cc4f62b54a0098f2a1cfb4ad
1 file changed
+4
-27
xdiff/xhistogram.c
+4
-27
@@ -102,7 +102,7 @@ static int cmp_recs(xpparam_t const *xpp,
102
(cmp_recs(xpp, REC(env, s1, l1), REC(env, s2, l2)))
103
104
#define CMP(i, s1, l1, s2, l2) \
105
- (CMP_ENV(i->xpp, i->env, s1, l1, s2, l2))
105
+ (cmp_recs(i->xpp, REC(i->env, s1, l1), REC(i->env, s2, l2)))
106
107
#define TABLE_HASH(index, side, line) \
108
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,
248
return index->has_common && index->max_chain_length < index->cnt;
249
}
250
251
-static void reduce_common_start_end(xpparam_t const *xpp, xdfenv_t *env,
252
- int *line1, int *count1, int *line2, int *count2)
253
-{
254
- if (*count1 <= 1 || *count2 <= 1)
255
- return;
256
- while (*count1 > 1 && *count2 > 1 && CMP_ENV(xpp, env, 1, *line1, 2, *line2)) {
257
- (*line1)++;
258
- (*count1)--;
259
- (*line2)++;
260
- (*count2)--;
261
- }
262
- while (*count1 > 1 && *count2 > 1 && CMP_ENV(xpp, env, 1, LINE_END_PTR(1), 2, LINE_END_PTR(2))) {
263
- (*count1)--;
264
- (*count2)--;
265
- }
266
-}
267
-
251
static int fall_back_to_classic_diff(struct histindex *index,
252
int line1, int count1, int line2, int count2)
253
{
@@ -372,16 +355,10 @@ cleanup:
355
int xdl_do_histogram_diff(mmfile_t *file1, mmfile_t *file2,
356
xpparam_t const *xpp, xdfenv_t *env)
357
{
375
- int line1, line2, count1, count2;
376
-
358
if (xdl_prepare_env(file1, file2, xpp, env) < 0)
359
return -1;
360
380
- line1 = line2 = 1;
381
- count1 = env->xdf1.nrec;
382
- count2 = env->xdf2.nrec;
383
-
384
- reduce_common_start_end(xpp, env, &line1, &count1, &line2, &count2);
385
-
386
- return histogram_diff(xpp, env, line1, count1, line2, count2);
361
+ return histogram_diff(xpp, env,
362
+ env->xdf1.dstart + 1, env->xdf1.dend - env->xdf1.dstart + 1,
363
+ env->xdf2.dstart + 1, env->xdf2.dend - env->xdf2.dstart + 1);
364
}