- if (sum != s->sums[i].sum1)
- continue;
-@@ -205,9 +187,11 @@ static void hash_search(int f,struct sum
- && !(s->sums[i].flags & SUMFLG_SAME_OFFSET))
- continue;
-
-- if (verbose > 3)
-- rprintf(FINFO,"potential match at %.0f target=%.0f %.0f sum=%08x\n",
-- (double)offset,(double)j,(double)i,sum);
-+ if (verbose > 3) {
-+ rprintf(FINFO,
-+ "potential match at %.0f i=%ld sum=%08x\n",
-+ (double)offset, (long)i, sum);
-+ }
-
- if (!done_csum2) {
- map = (schar *)map_ptr(buf,offset,l);
-@@ -224,8 +208,8 @@ static void hash_search(int f,struct sum
- * one with an identical offset, so we prefer that over
- * the following want_i optimization. */
- if (updating_basis_file) {
-- do {
-- int32 i2 = targets[j].i;
-+ int32 i2;
-+ for (i2 = i; i2 >= 0; i2 = s->sums[i2].chain) {
- if (s->sums[i2].offset != offset)
- continue;
- if (i2 != i) {
-@@ -240,7 +224,7 @@ static void hash_search(int f,struct sum
- * both the sender and the receiver. */
- s->sums[i].flags |= SUMFLG_SAME_OFFSET;
- goto set_want_i;
-- } while (++j < s->count && targets[j].t == t);
-+ }
- }
-
- /* we've found a match, but now check to see
-@@ -266,9 +250,8 @@ static void hash_search(int f,struct sum
- s2 = sum >> 16;
- matches++;
- break;
-- } while (++j < s->count && targets[j].t == t);
-+ }
-
-- null_tag:
- backup = offset - last_match;
- /* We sometimes read 1 byte prior to last_match... */
- if (backup < 0)
-@@ -375,11 +358,6 @@ void match_sums(int f, struct sum_struct
- rprintf(FINFO,"sending file_sum\n");
- write_buf(f,file_sum,MD4_SUM_LENGTH);
-
-- if (targets) {
-- free(targets);
-- targets=NULL;
-- }
--
- if (verbose > 2)
- rprintf(FINFO, "false_alarms=%d tag_hits=%d matches=%d\n",
- false_alarms, tag_hits, matches);
---- old/rsync.h
-+++ new/rsync.h
-@@ -560,6 +560,7 @@ struct sum_buf {
- OFF_T offset; /**< offset in file of this chunk */
- int32 len; /**< length of chunk of file */
- uint32 sum1; /**< simple checksum */
-+ int32 chain; /**< next hash-table collision */
- short flags; /**< flag bits */
- char sum2[SUM_LENGTH]; /**< checksum */
- };
+ for (i = 0; i < s->count; i++) {
+ uint32 t = SUM2HASH(s->sums[i].sum1);
+@@ -165,11 +172,11 @@ static void hash_search(int f,struct sum
+ (double)offset, s2 & 0xFFFF, s1 & 0xFFFF);
+ }
+
+- i = hash_table[SUM2HASH2(s1,s2)];
++ sum = (s1 & 0xffff) | (s2 << 16);
++ i = hash_table[SUM2HASH(sum)];
+ if (i < 0)
+ goto null_hash;
+
+- sum = (s1 & 0xffff) | (s2 << 16);
+ hash_hits++;
+ do {
+ int32 l;