search for: read_batch_csums_fil

...f); + 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 csum_length; - read_batch_csums_file((char *) &file_flist_entry, sizeof(int)); + read_batch_csums_file( &amp...

...strerror(errno)); + filename, strerror(errno)); close(fdb); exit_cleanup(1); } + return bytes_read; } - void read_batch_csum_info(int flist_entry, struct sum_struct *s, int *checksums_match) { @@ -468,11 +465,9 @@ char file_sum2[SUM_LENGTH]; extern int csum_length; - read_batch_csums_file((char *) &file_flist_entry, sizeof(int)); if (file_flist_entry != flist_entry) { - rprintf(FINFO, "file_list_entry NE flist_entry\n"); - rprintf(FINFO, "file_flist_entry = %d flist_entry = %d\n", + rprintf(FINFO, "file_flist_entry (%d) != flist_entry (%d)\n"...

> 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.