/*
Copyright (C) Andrew Tridgell 1998
+ Copyright (C) 2002 by Martin Pool
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
static int write_sparse(int f,char *buf,size_t len)
{
- int l1=0,l2=0;
+ size_t l1=0, l2=0;
int ret;
for (l1=0;l1<len && buf[l1]==0;l1++) ;
if (l1 == len)
return len;
- if ((ret=write(f,buf+l1,len-(l1+l2))) != len-(l1+l2)) {
- if (ret == -1 || ret == 0) return ret;
+ ret = write(f, buf + l1, len - (l1+l2));
+ if (ret == -1 || ret == 0)
+ return ret;
+ else if (ret != (int) (len - (l1+l2)))
return (l1+ret);
- }
if (l2 > 0)
do_lseek(f,l2,SEEK_CUR);
}
if (f != -1) {
- io_end_buffering(f);
+ io_end_buffering();
stats.flist_size = stats.total_written - start_write;
stats.num_files = flist->count;
if (write_batch) /* dw */
if (!tag_table || !targets)
out_of_memory("build_hash_table");
- for (i=0;i<s->count;i++) {
+ for (i=0;i<(int) s->count;i++) {
targets[i].i = i;
targets[i].t = gettag(s->sums[i].sum1);
}
sum = (s1 & 0xffff) | (s2 << 16);
tag_hits++;
- for (; j<s->count && targets[j].t == t; j++) {
+ for (; j < (int) s->count && targets[j].t == t; j++) {
int l, i = targets[j].i;
if (sum != s->sums[i].sum1) continue;
/* we've found a match, but now check to see
if last_i can hint at a better match */
- for (j++; j<s->count && targets[j].t == t; j++) {
+ for (j++; j < (int) s->count && targets[j].t == t; j++) {
int i2 = targets[j].i;
if (i2 == last_i + 1) {
if (sum != s->sums[i2].sum1) break;
i = -(i+1);
offset2 = i*(OFF_T)n;
len = n;
- if (i == count-1 && remainder != 0)
+ if (i == (int) count-1 && remainder != 0)
len = remainder;
stats.matched_data += len;
sum_update(map,len);
}
- if (fd != -1 && write_file(fd,map,len) != len) {
+ if (fd != -1 && write_file(fd,map,len) != (int) len) {
rprintf(FERROR,"write failed on %s : %s\n",
fname,strerror(errno));
exit_cleanup(RERR_FILEIO);
s->sums = (struct sum_buf *)malloc(sizeof(s->sums[0])*s->count);
if (!s->sums) out_of_memory("receive_sums");
- for (i=0;i<s->count;i++) {
+ for (i=0; i < (int) s->count;i++) {
s->sums[i].sum1 = read_int(f);
read_buf(f,s->sums[i].sum2,csum_length);
s->sums[i].offset = offset;
s->sums[i].i = i;
- if (i == s->count-1 && s->remainder != 0) {
+ if (i == (int) s->count-1 && s->remainder != 0) {
s->sums[i].len = s->remainder;
} else {
s->sums[i].len = s->n;
globfree(&globbuf);
return;
}
- for (i=0; i<(maxargs - (*argc)) && i<globbuf.gl_pathc;i++) {
+ for (i=0; i<(maxargs - (*argc)) && i < (int) globbuf.gl_pathc;i++) {
if (i == 0) free(argv[*argc]);
argv[(*argc) + i] = strdup(globbuf.gl_pathv[i]);
if (!argv[(*argc) + i]) out_of_memory("glob_expand");