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
7f6e708
..
3689af4
100644
(file)
--- a/
match.c
+++ b/
match.c
@@
-87,13
+87,13
@@
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)
@@
-123,21
+123,21
@@
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)
fprintf(FINFO,"hash search b=%d len=%d\n",s->n,(int)len);
k = MIN(len, s->n);
if (verbose > 2)
fprintf(FINFO,"hash search b=%d len=%d\n",s->n,(int)len);
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;
sum = get_checksum1((char *)map, k);
s1 = sum & 0xFFFF;
@@
-178,7
+178,7
@@
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 = (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];