search for: close_batch_delta_file

...== s->count - 1)) { @@ -486,7 +487,7 @@ } -void write_batch_delta_file(char *buff, int bytes_to_write) +void write_batch_delta_file(const void *buff, int bytes_to_write) { static int fdb_delta_open = 1; @@ -516,13 +517,13 @@ exit_cleanup(1); } } -void close_batch_delta_file() +void close_batch_delta_file(void) { close(fdb_delta); } -int read_batch_delta_file(char *buff, int len) +int read_batch_delta_file(void *buff, int len) { static int fdb_delta_open = 1; int bytes_read;

...le_sum2, csum_length); @@ -498,7 +499,7 @@ } -void write_batch_delta_file(char *buff, int bytes_to_write) +void write_batch_delta_file(const void *buff, int bytes_to_write) { static int fdb_delta_open = 1; @@ -528,13 +529,13 @@ exit_cleanup(1); } } -void close_batch_delta_file() +void close_batch_delta_file(void) { close(fdb_delta); } -int read_batch_delta_file(char *buff, int len) +int read_batch_delta_file(void *buff, int len) { static int fdb_delta_open = 1; int bytes_read; EAGLE>

...lta); exit_cleanup(1); } @@ -523,32 +520,33 @@ if (write(fdb_delta, buff, bytes_to_write) == -1) { rprintf(FERROR, "Batch file %s write error: %s\n", - rsync_delta_file, strerror(errno)); + filename, strerror(errno)); close(fdb_delta); exit_cleanup(1); } } -void close_batch_delta_file() + +void close_batch_delta_file(void) { close(fdb_delta); - } int read_batch_delta_file(char *buff, int len) { static int fdb_delta_open = 1; int bytes_read; + char filename[MAXPATHLEN]; if (fdb_delta_open) { - - /* Set up file extension */ - strcat(rsync_delta_file, batch_file...

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

...*auth_server(int fd, int module, char *addr, char *leader); void auth_client(int fd, char *user, char *challenge); +int make_backup(char *fname); void create_batch_file_ext(); void set_batch_file_ext(char *ext); void write_batch_flist_file(char *buff, int bytes_to_write); @@ -23,7 +24,6 @@ void close_batch_delta_file(); int read_batch_delta_file(char *buff, int len); void show_flist(int index, struct file_struct **fptr); void show_argvs(int argc, char *argv[]); -int make_backup(char *fname); uint32 get_checksum1(char *buf1,int len); void get_checksum2(char *buf,int len,char *sum); void file_checksum(char...