From 536541d52b695ef9c949cc9a39ce2064cf9aa9e3 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 5 Jan 1999 06:43:59 +0000 Subject: [PATCH] moved the block length mismatch code to another part of the loop. --- match.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/match.c b/match.c index 613eaec8..7f3212c8 100644 --- a/match.c +++ b/match.c @@ -176,16 +176,19 @@ static void hash_search(int f,struct sum_struct *s, sum = (s1 & 0xffff) | (s2 << 16); tag_hits++; for (; jcount && targets[j].t == t; j++) { - int i = targets[j].i; + int l, i = targets[j].i; - if (sum != s->sums[i].sum1 || s->sums[i].len > (len-offset)) continue; + if (sum != s->sums[i].sum1) continue; + /* also make sure the two blocks are the same length */ + l = MIN(s->n,len-offset); + if (l != s->sums[i].len) continue; + if (verbose > 3) rprintf(FINFO,"potential match at %d target=%d %d sum=%08x\n", (int)offset,j,i,sum); if (!done_csum2) { - int l = MIN(s->n,len-offset); map = (schar *)map_ptr(buf,offset,l); get_checksum2((char *)map,l,sum2); done_csum2 = 1; -- 2.34.1