}
if (link_dest) {
if (preserve_perms
- && (st->st_mode & ~_S_IFMT) != (file->mode & ~_S_IFMT))
+ && (st->st_mode & ~_S_IFMT) != (file->mode & ~_S_IFMT))
return 0;
if (am_root && preserve_uid && st->st_uid != file->uid)
return 0;
- if (preserve_gid && file->gid != (gid_t)-1
- && st->st_gid != file->gid)
+ if (preserve_gid && file->gid != GID_NONE
+ && st->st_gid != file->gid)
return 0;
}
/*
- * NULL sum_struct means we have no checksums
+ * NULL sum_struct means we have no checksums
*/
-
void write_sum_head(int f, struct sum_struct *sum)
{
static struct sum_struct null_sum;
static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
{
- extern int block_size;
- int blength, s2length, b;
+ extern unsigned int block_size;
+ unsigned int blength;
+ int s2length;
uint32 c;
uint64 l;
} else if (csum_length == SUM_LENGTH) {
s2length = SUM_LENGTH;
} else {
- b = BLOCKSUM_BIAS;
+ int b = BLOCKSUM_BIAS;
l = len;
while (l >>= 1) {
b += 2;
sum->remainder = (len % blength);
if (sum->count && verbose > 2) {
- rprintf(FINFO, "count=%ld rem=%ld blength=%ld s2length=%ld flength=%.0f\n",
- (long) sum->count, (long) sum->remainder,
- (long) sum->blength, (long) sum->s2length,
- (double) sum->flength);
+ rprintf(FINFO, "count=%.0f rem=%u blength=%u s2length=%d flength=%.0f\n",
+ (double)sum->count, sum->remainder, sum->blength,
+ sum->s2length, (double)sum->flength);
}
}
*
* Generate approximately one checksum every block_len bytes.
*/
-static void generate_and_send_sums(struct map_struct *buf, OFF_T len, int f_out)
+static void generate_and_send_sums(struct map_struct *buf, size_t len, int f_out)
{
size_t i;
struct sum_struct sum;
write_sum_head(f_out, &sum);
for (i = 0; i < sum.count; i++) {
- int n1 = MIN(len, sum.blength);
+ unsigned int n1 = MIN(len, sum.blength);
char *map = map_ptr(buf, offset, n1);
uint32 sum1 = get_checksum1(map, n1);
char sum2[SUM_LENGTH];
if (verbose > 3) {
rprintf(FINFO,
- "chunk[%ld] offset=%.0f len=%d sum1=%08lx\n",
- (long)i,(double)offset,n1,(unsigned long)sum1);
+ "chunk[%.0f] offset=%.0f len=%u sum1=%08lx\n",
+ (double)i, (double)offset, n1,
+ (unsigned long)sum1);
}
write_int(f_out, sum1);
write_buf(f_out, sum2, sum.s2length);