static int matches;
static int data_transfer;
-static int total_false_alarms=0;
-static int total_tag_hits=0;
-static int total_matches=0;
-static int total_data_transfer=0;
+static int total_false_alarms;
+static int total_tag_hits;
+static int total_matches;
+static int64 total_data_transfer;
struct target {
int i;
};
-static struct target *targets=NULL;
+static struct target *targets;
-static tag *tag_table = NULL;
+static tag *tag_table;
#define gettag2(s1,s2) (((s1) + (s2)) & 0xFFFF)
#define gettag(sum) gettag2((sum)&0xFFFF,(sum)>>16)
off_t n = offset - last_match;
int j;
- if (verbose > 2 && i != -1)
- fprintf(FERROR,"match at %d last_match=%d j=%d len=%d n=%d\n",
+ if (verbose > 2 && i >= 0)
+ fprintf(FINFO,"match at %d last_match=%d j=%d len=%d n=%d\n",
(int)offset,(int)last_match,i,(int)s->sums[i].len,(int)n);
send_token(f,i,buf,last_match,n,i==-1?0:s->sums[i].len);
if (n > 0)
write_flush(f);
- if (i != -1)
+ if (i >= 0)
n += s->sums[i].len;
for (j=0;j<n;j+=CHUNK_SIZE) {
}
- if (i != -1)
+ if (i >= 0)
last_match = offset + s->sums[i].len;
+ else
+ last_match = offset;
}
signed char *map;
if (verbose > 2)
- fprintf(FERROR,"hash search b=%d len=%d\n",s->n,(int)len);
+ fprintf(FINFO,"hash search b=%d len=%d\n",s->n,(int)len);
k = MIN(len, s->n);
s1 = sum & 0xFFFF;
s2 = sum >> 16;
if (verbose > 3)
- fprintf(FERROR, "sum=%.8x k=%d\n", sum, k);
+ fprintf(FINFO, "sum=%.8x k=%d\n", sum, k);
offset = 0;
end = len + 1 - s->sums[s->count-1].len;
if (verbose > 3)
- fprintf(FERROR,"hash search s->n=%d len=%d count=%d\n",
+ fprintf(FINFO,"hash search s->n=%d len=%d count=%d\n",
s->n,(int)len,s->count);
do {
j = tag_table[t];
if (verbose > 4)
- fprintf(FERROR,"offset=%d sum=%08x\n",(int)offset,sum);
+ fprintf(FINFO,"offset=%d sum=%08x\n",(int)offset,sum);
if (j == NULL_TAG) {
goto null_tag;
if (sum != s->sums[i].sum1) continue;
if (verbose > 3)
- fprintf(FERROR,"potential match at %d target=%d %d sum=%08x\n",
+ fprintf(FINFO,"potential match at %d target=%d %d sum=%08x\n",
(int)offset,j,i,sum);
if (!done_csum2) {
build_hash_table(s);
if (verbose > 2)
- fprintf(FERROR,"built hash table\n");
+ fprintf(FINFO,"built hash table\n");
hash_search(f,s,buf,len);
if (verbose > 2)
- fprintf(FERROR,"done hash search\n");
+ fprintf(FINFO,"done hash search\n");
} else {
matched(f,s,buf,len,-1);
}
if (remote_version >= 14) {
if (verbose > 2)
- fprintf(FERROR,"sending file_sum\n");
+ fprintf(FINFO,"sending file_sum\n");
write_buf(f,file_sum,MD4_SUM_LENGTH);
}
}
if (verbose > 2)
- fprintf(FERROR, "false_alarms=%d tag_hits=%d matches=%d\n",
+ fprintf(FINFO, "false_alarms=%d tag_hits=%d matches=%d\n",
false_alarms, tag_hits, matches);
total_tag_hits += tag_hits;
return;
fprintf(FINFO,
- "total: matches=%d tag_hits=%d false_alarms=%d data=%d\n",
+ "total: matches=%d tag_hits=%d false_alarms=%d data=%ld\n",
total_matches,total_tag_hits,
- total_false_alarms,total_data_transfer);
+ total_false_alarms,(long)total_data_transfer);
}