Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Solaris 2.6 doesn't support "signed char". What a broken system!
[rsync/rsync.git]
/
match.c
diff --git
a/match.c
b/match.c
index
1677900
..
3689af4
100644
(file)
--- a/
match.c
+++ b/
match.c
@@
-39,7
+39,7
@@
static int data_transfer;
static int total_false_alarms;
static int total_tag_hits;
static int total_matches;
static int total_false_alarms;
static int total_tag_hits;
static int total_matches;
-static
off_t
total_data_transfer;
+static
int64
total_data_transfer;
struct target {
struct target {
@@
-56,7
+56,7
@@
static tag *tag_table;
static int compare_targets(struct target *t1,struct target *t2)
{
static int compare_targets(struct target *t1,struct target *t2)
{
- return(
t1->t -
t2->t);
+ return(
(int)t1->t - (int)
t2->t);
}
}
@@
-87,17
+87,17
@@
static void build_hash_table(struct sum_struct *s)
}
}
-static
off_t
last_match;
+static
OFF_T
last_match;
static void matched(int f,struct sum_struct *s,struct map_struct *buf,
static void matched(int f,struct sum_struct *s,struct map_struct *buf,
-
off_t
offset,int i)
+
OFF_T
offset,int i)
{
{
-
off_t
n = offset - last_match;
+
OFF_T
n = offset - last_match;
int j;
if (verbose > 2 && i >= 0)
int j;
if (verbose > 2 && i >= 0)
- fprintf(F
ERROR
,"match at %d last_match=%d j=%d len=%d n=%d\n",
+ fprintf(F
INFO
,"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);
(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);
@@
-123,34
+123,34
@@
static void matched(int f,struct sum_struct *s,struct map_struct *buf,
static void hash_search(int f,struct sum_struct *s,
static void hash_search(int f,struct sum_struct *s,
- struct map_struct *buf,
off_t
len)
+ struct map_struct *buf,
OFF_T
len)
{
{
-
off_t
offset;
+
OFF_T
offset;
int j,k;
int end;
char sum2[SUM_LENGTH];
uint32 s1, s2, sum;
int j,k;
int end;
char sum2[SUM_LENGTH];
uint32 s1, s2, sum;
- s
igned
char *map;
+ schar *map;
if (verbose > 2)
if (verbose > 2)
- fprintf(F
ERROR
,"hash search b=%d len=%d\n",s->n,(int)len);
+ fprintf(F
INFO
,"hash search b=%d len=%d\n",s->n,(int)len);
k = MIN(len, s->n);
k = MIN(len, s->n);
- map = (s
igned
char *)map_ptr(buf,0,k);
+ map = (schar *)map_ptr(buf,0,k);
sum = get_checksum1((char *)map, k);
s1 = sum & 0xFFFF;
s2 = sum >> 16;
if (verbose > 3)
sum = get_checksum1((char *)map, k);
s1 = sum & 0xFFFF;
s2 = sum >> 16;
if (verbose > 3)
- fprintf(F
ERROR
, "sum=%.8x k=%d\n", sum, k);
+ fprintf(F
INFO
, "sum=%.8x k=%d\n", sum, k);
offset = 0;
end = len + 1 - s->sums[s->count-1].len;
if (verbose > 3)
offset = 0;
end = len + 1 - s->sums[s->count-1].len;
if (verbose > 3)
- fprintf(F
ERROR
,"hash search s->n=%d len=%d count=%d\n",
+ fprintf(F
INFO
,"hash search s->n=%d len=%d count=%d\n",
s->n,(int)len,s->count);
do {
s->n,(int)len,s->count);
do {
@@
-159,7
+159,7
@@
static void hash_search(int f,struct sum_struct *s,
j = tag_table[t];
if (verbose > 4)
j = tag_table[t];
if (verbose > 4)
- fprintf(F
ERROR
,"offset=%d sum=%08x\n",(int)offset,sum);
+ fprintf(F
INFO
,"offset=%d sum=%08x\n",(int)offset,sum);
if (j == NULL_TAG) {
goto null_tag;
if (j == NULL_TAG) {
goto null_tag;
@@
-173,12
+173,12
@@
static void hash_search(int f,struct sum_struct *s,
if (sum != s->sums[i].sum1) continue;
if (verbose > 3)
if (sum != s->sums[i].sum1) continue;
if (verbose > 3)
- fprintf(F
ERROR
,"potential match at %d target=%d %d sum=%08x\n",
+ fprintf(F
INFO
,"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);
(int)offset,j,i,sum);
if (!done_csum2) {
int l = MIN(s->n,len-offset);
- map = (s
igned
char *)map_ptr(buf,offset,l);
+ map = (schar *)map_ptr(buf,offset,l);
get_checksum2((char *)map,l,sum2);
done_csum2 = 1;
}
get_checksum2((char *)map,l,sum2);
done_csum2 = 1;
}
@@
-191,7
+191,7
@@
static void hash_search(int f,struct sum_struct *s,
matched(f,s,buf,offset,i);
offset += s->sums[i].len - 1;
k = MIN((len-offset), s->n);
matched(f,s,buf,offset,i);
offset += s->sums[i].len - 1;
k = MIN((len-offset), s->n);
- map = (s
igned
char *)map_ptr(buf,offset,k);
+ map = (schar *)map_ptr(buf,offset,k);
sum = get_checksum1((char *)map, k);
s1 = sum & 0xFFFF;
s2 = sum >> 16;
sum = get_checksum1((char *)map, k);
s1 = sum & 0xFFFF;
s2 = sum >> 16;
@@
-201,7
+201,7
@@
static void hash_search(int f,struct sum_struct *s,
null_tag:
/* Trim off the first byte from the checksum */
null_tag:
/* Trim off the first byte from the checksum */
- map = (s
igned
char *)map_ptr(buf,offset,k+1);
+ map = (schar *)map_ptr(buf,offset,k+1);
s1 -= map[0] + CHAR_OFFSET;
s2 -= k * (map[0]+CHAR_OFFSET);
s1 -= map[0] + CHAR_OFFSET;
s2 -= k * (map[0]+CHAR_OFFSET);
@@
-220,7
+220,7
@@
static void hash_search(int f,struct sum_struct *s,
}
}
-void match_sums(int f,struct sum_struct *s,struct map_struct *buf,
off_t
len)
+void match_sums(int f,struct sum_struct *s,struct map_struct *buf,
OFF_T
len)
{
char file_sum[MD4_SUM_LENGTH];
{
char file_sum[MD4_SUM_LENGTH];
@@
-236,12
+236,12
@@
void match_sums(int f,struct sum_struct *s,struct map_struct *buf,off_t len)
build_hash_table(s);
if (verbose > 2)
build_hash_table(s);
if (verbose > 2)
- fprintf(F
ERROR
,"built hash table\n");
+ fprintf(F
INFO
,"built hash table\n");
hash_search(f,s,buf,len);
if (verbose > 2)
hash_search(f,s,buf,len);
if (verbose > 2)
- fprintf(F
ERROR
,"done hash search\n");
+ fprintf(F
INFO
,"done hash search\n");
} else {
matched(f,s,buf,len,-1);
}
} else {
matched(f,s,buf,len,-1);
}
@@
-250,7
+250,7
@@
void match_sums(int f,struct sum_struct *s,struct map_struct *buf,off_t len)
if (remote_version >= 14) {
if (verbose > 2)
if (remote_version >= 14) {
if (verbose > 2)
- fprintf(F
ERROR
,"sending file_sum\n");
+ fprintf(F
INFO
,"sending file_sum\n");
write_buf(f,file_sum,MD4_SUM_LENGTH);
}
write_buf(f,file_sum,MD4_SUM_LENGTH);
}
@@
-260,7
+260,7
@@
void match_sums(int f,struct sum_struct *s,struct map_struct *buf,off_t len)
}
if (verbose > 2)
}
if (verbose > 2)
- fprintf(F
ERROR
, "false_alarms=%d tag_hits=%d matches=%d\n",
+ fprintf(F
INFO
, "false_alarms=%d tag_hits=%d matches=%d\n",
false_alarms, tag_hits, matches);
total_tag_hits += tag_hits;
false_alarms, tag_hits, matches);
total_tag_hits += tag_hits;