search for: close_batch_csums_fil

...har *)strdup(buff); } else { file[0].sum = NULL; } } -void write_batch_csums_file(char *buff, int bytes_to_write) +void write_batch_csums_file(const void *buff, int bytes_to_write) { static int fdb_open = 1; @@ -377,7 +378,7 @@ } } -void close_batch_csums_file() +void close_batch_csums_file(void) { close(fdb); @@ -394,12 +395,12 @@ /* Write csum info to batch file */ - write_batch_csums_file((char *) flist_entry, sizeof(int)); - write_batch_csums_file((char *) (s ? &s->count : &int_zero), + write_batch...

...atch_flist_file(buff, int_str_len); buff[int_str_len] = '\0'; - file[0].sum = strdup(buff); + file[0].sum = (unsigned char *)strdup(buff); } else { file[0].sum = NULL; } @@ -386,7 +387,7 @@ } } -void close_batch_csums_file() +void close_batch_csums_file(void) { close(fdb); @@ -423,7 +424,7 @@ } } -int read_batch_csums_file(char *buff, int len) +int read_batch_csums_file(void *buff, int len) { static int fdb_open = 1; int bytes_read; @@ -469,7 +470,7 @@ extern int...

...close(fdb); exit_cleanup(1); } @@ -380,16 +381,15 @@ if (write(fdb, buff, bytes_to_write) == -1) { rprintf(FERROR, "Batch file %s write error: %s\n", - rsync_csums_file, strerror(errno)); + filename, strerror(errno)); close(fdb); exit_cleanup(1); } } -void close_batch_csums_file() +void close_batch_csums_file(void) { close(fdb); - } void write_batch_csum_info(int *flist_entry, int flist_count, @@ -405,10 +405,7 @@ /* FIXME: This will break if s->count is ever not exactly an int. */ write_batch_csums_file(flist_entry, sizeof(int)); - if (s) - write_batch_c...

> Just curious: what about the rsync+ patch? Thanks for the reminder. I've just committed Jos's rsync+ patch onto the "branch_mbp_rsyncplus_merge" branch. If it works OK and nobody screams I will move it across onto the main tree tomorrow or Wednesday. I see the patch doesn't add documentation about the new options to the man page, so we should fix that in the future.