if (!tag_table || !targets)
out_of_memory("build_hash_table");
- for (i=0;i<s->count;i++) {
+ for (i=0;i<(int) s->count;i++) {
targets[i].i = i;
targets[i].t = gettag(s->sums[i].sum1);
}
else
last_match = offset;
- if (buf)
+ if (buf) {
show_progress(last_match, buf->file_size);
- if (i == -1) end_progress();
+ if (i == -1) end_progress(buf->file_size);
+ }
}
sum = (s1 & 0xffff) | (s2 << 16);
tag_hits++;
- for (; j<s->count && targets[j].t == t; j++) {
+ for (; j < (int) s->count && targets[j].t == t; j++) {
int l, i = targets[j].i;
if (sum != s->sums[i].sum1) continue;
/* we've found a match, but now check to see
if last_i can hint at a better match */
- for (j++; j<s->count && targets[j].t == t; j++) {
+ for (j++; j < (int) s->count && targets[j].t == t; j++) {
int i2 = targets[j].i;
if (i2 == last_i + 1) {
if (sum != s->sums[i2].sum1) break;
match. The 3 reads are caused by the
running match, the checksum update and the
literal send. */
- if (offset-last_match >= CHUNK_SIZE+s->n &&
+ if (offset > last_match &&
+ offset-last_match >= CHUNK_SIZE+s->n &&
(end-offset > CHUNK_SIZE)) {
matched(f,s,buf,offset - s->n, -2);
}
void match_sums(int f,struct sum_struct *s,struct map_struct *buf,OFF_T len)
{
char file_sum[MD4_SUM_LENGTH];
+ extern int write_batch; /* dw */
last_match = 0;
false_alarms = 0;
if (verbose > 2)
rprintf(FINFO,"sending file_sum\n");
write_buf(f,file_sum,MD4_SUM_LENGTH);
+ if (write_batch) /* dw */
+ write_batch_delta_file(file_sum, MD4_SUM_LENGTH);
}
if (targets) {