Previously we were over-complicating matters by trying to combine the
recursed results. Now, terminate immediately if a recursive call failed
and return its result.
Signed-off-by: Tay Ray Chuan <rctay89@xxxxxxxxx>
---
xdiff/xhistogram.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c
index 391333a..9cb69ea 100644
--- a/xdiff/xhistogram.c
+++ b/xdiff/xhistogram.c
@@ -339,21 +339,22 @@ static int histogram_diff(xpparam_t const *xpp, xdfenv_t *env,
if (find_lcs(&index, &lcs, line1, count1, line2, count2))
result = fall_back_to_classic_diff(&index, line1, count1, line2, count2);
else {
- result = 0;
if (lcs.begin1 == 0 && lcs.begin2 == 0) {
int ptr;
for (ptr = 0; ptr < count1; ptr++)
env->xdf1.rchg[line1 + ptr - 1] = 1;
for (ptr = 0; ptr < count2; ptr++)
env->xdf2.rchg[line2 + ptr - 1] = 1;
+ result = 0;
} else {
- result = histogram_diff(xpp, env,
+ if (result = histogram_diff(xpp, env,
line1, lcs.begin1 - line1,
- line2, lcs.begin2 - line2);
- result = histogram_diff(xpp, env,
+ line2, lcs.begin2 - line2))
+ goto cleanup;
+ if (result = histogram_diff(xpp, env,
lcs.end1 + 1, LINE_END(1) - lcs.end1,
- lcs.end2 + 1, LINE_END(2) - lcs.end2);
- result *= -1;
+ lcs.end2 + 1, LINE_END(2) - lcs.end2))
+ goto cleanup;
}
}
--
1.7.3.4.730.g67af1.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html