- int32 i2;
- for (i2 = i; i2 >= 0; i2 = s->sums[i2].chain) {
- if (s->sums[i2].offset != aligned_offset)
- continue;
- if (i2 != i) {
- if (sum != s->sums[i2].sum1
- || l != s->sums[i2].len
- || memcmp(sum2, s->sums[i2].sum2, s->s2length) != 0)
- break;
- i = i2;
- }
- want_i = i;
- if (offset != aligned_offset) {
- /* We've matched some zeros in a spot that is also zeros
- * further along in the basis file, if we find zeros ahead
- * in the sender's file, we'll output enough literal data
- * to re-align with the basis file, and get back to seeking
- * instead of writing. */
- backup = (int32)(aligned_offset - last_match);
- if (backup < 0)
- backup = 0;
- map = (schar *)map_ptr(buf, aligned_offset - backup, l + backup)
- + backup;
- sum = get_checksum1((char *)map, l);
- if (sum != s->sums[i2].sum1)
- break;
- get_checksum2((char *)map, l, sum2);
- if (memcmp(sum2, s->sums[i2].sum2, s->s2length) != 0)
- break;
- /* OK, we have a re-alignment match. Bump the offset
- * forward to the new match point. */
- offset = aligned_offset;
- }
- /* This chunk remained in the same spot in the old and new file. */
- s->sums[i].flags |= SUMFLG_SAME_OFFSET;
- break;
+ if (i != aligned_i) {
+ if (sum != s->sums[aligned_i].sum1
+ || l != s->sums[aligned_i].len
+ || memcmp(sum2, s->sums[aligned_i].sum2, s->s2length) != 0)
+ goto check_want_i;
+ i = aligned_i;
+ }
+ if (offset != aligned_offset) {
+ /* We've matched some zeros in a spot that is also zeros
+ * further along in the basis file, if we find zeros ahead
+ * in the sender's file, we'll output enough literal data
+ * to re-align with the basis file, and get back to seeking
+ * instead of writing. */
+ backup = (int32)(aligned_offset - last_match);
+ if (backup < 0)
+ backup = 0;
+ map = (schar *)map_ptr(buf, aligned_offset - backup, l + backup)
+ + backup;
+ sum = get_checksum1((char *)map, l);
+ if (sum != s->sums[i].sum1)
+ goto check_want_i;
+ get_checksum2((char *)map, l, sum2);
+ if (memcmp(sum2, s->sums[i].sum2, s->s2length) != 0)
+ goto check_want_i;
+ /* OK, we have a re-alignment match. Bump the offset
+ * forward to the new match point. */
+ offset = aligned_offset;