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
for systems with a broken select use u_sleep() to ensure the write
[rsync/rsync.git]
/
match.c
diff --git
a/match.c
b/match.c
index
591558f
..
33fc6e1
100644
(file)
--- a/
match.c
+++ b/
match.c
@@
-91,7
+91,6
@@
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 len,
int offset,int i)
{
int n = offset - last_match;
int offset,int i)
{
int n = offset - last_match;
@@
-130,16
+129,16
@@
static void hash_search(int f,struct sum_struct *s,
int end;
char sum2[SUM_LENGTH];
uint32 s1, s2, sum;
int end;
char sum2[SUM_LENGTH];
uint32 s1, s2, sum;
- char *map;
+
signed
char *map;
if (verbose > 2)
fprintf(FERROR,"hash search b=%d len=%d\n",s->n,(int)len);
k = MIN(len, s->n);
if (verbose > 2)
fprintf(FERROR,"hash search b=%d len=%d\n",s->n,(int)len);
k = MIN(len, s->n);
- map = map_ptr(buf,0,k);
+ map =
(signed char *)
map_ptr(buf,0,k);
- sum = get_checksum1(map, k);
+ sum = get_checksum1(
(char *)
map, k);
s1 = sum & 0xFFFF;
s2 = sum >> 16;
if (verbose > 3)
s1 = sum & 0xFFFF;
s2 = sum >> 16;
if (verbose > 3)
@@
-175,16
+174,16
@@
static void hash_search(int f,struct sum_struct *s,
if (!done_csum2) {
int l = MIN(s->n,len-offset);
if (!done_csum2) {
int l = MIN(s->n,len-offset);
- map = map_ptr(buf,offset,l);
- get_checksum2(map,l,sum2);
+ map =
(signed char *)
map_ptr(buf,offset,l);
+ get_checksum2(
(char *)
map,l,sum2);
done_csum2 = 1;
}
if (memcmp(sum2,s->sums[i].sum2,csum_length) == 0) {
done_csum2 = 1;
}
if (memcmp(sum2,s->sums[i].sum2,csum_length) == 0) {
- matched(f,s,buf,
len,
offset,i);
+ matched(f,s,buf,offset,i);
offset += s->sums[i].len - 1;
k = MIN((len-offset), s->n);
offset += s->sums[i].len - 1;
k = MIN((len-offset), s->n);
- map = map_ptr(buf,offset,k);
- sum = get_checksum1(map, k);
+ map =
(signed char *)
map_ptr(buf,offset,k);
+ sum = get_checksum1(
(char *)
map, k);
s1 = sum & 0xFFFF;
s2 = sum >> 16;
++matches;
s1 = sum & 0xFFFF;
s2 = sum >> 16;
++matches;
@@
-198,7
+197,7
@@
static void hash_search(int f,struct sum_struct *s,
}
/* Trim off the first byte from the checksum */
}
/* Trim off the first byte from the checksum */
- map = map_ptr(buf,offset,k+1);
+ map =
(signed char *)
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);
@@
-212,7
+211,7
@@
static void hash_search(int f,struct sum_struct *s,
} while (++offset < end);
} while (++offset < end);
- matched(f,s,buf,len,
len,
-1);
+ matched(f,s,buf,len,-1);
map_ptr(buf,len-1,1);
}
map_ptr(buf,len-1,1);
}
@@
-240,7
+239,7
@@
void match_sums(int f,struct sum_struct *s,struct map_struct *buf,off_t len)
if (verbose > 2)
fprintf(FERROR,"done hash search\n");
} else {
if (verbose > 2)
fprintf(FERROR,"done hash search\n");
} else {
- matched(f,s,buf,len,
len,
-1);
+ matched(f,s,buf,len,-1);
}
sum_end(file_sum);
}
sum_end(file_sum);