X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8950ac03f8fd0fb645c7d2374195ea884d091f72..0e9480317dbb5b8003535a769f4a03bc720d5f5f:/receiver.c diff --git a/receiver.c b/receiver.c index 2f679b17..6b6b63a5 100644 --- a/receiver.c +++ b/receiver.c @@ -38,8 +38,8 @@ extern int make_backups; extern char *backup_suffix; static struct delete_list { - dev_t dev; - INO_T inode; + DEV64_T dev; + INO64_T inode; } *delete_list; static int dlist_len, dlist_alloc_len; @@ -206,7 +206,8 @@ static int get_tmpname(char *fnametmp, char *fname) static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname, OFF_T total_size) { - int i,n,remainder,len,count; + int i; + unsigned int n,remainder,len,count; OFF_T offset = 0; OFF_T offset2; char *data; @@ -248,7 +249,7 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname, 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; @@ -264,7 +265,7 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname, 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); @@ -488,7 +489,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen) } if (preserve_hard_links) - do_hard_links(flist); + do_hard_links(); /* now we need to fix any directory permissions that were modified during the transfer */