X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/63787382d8590f0f8eea8d4fd4f7cc396c59c980..1c09c743b123af3471ac673fc37f09b28b83238a:/generator.c diff --git a/generator.c b/generator.c index ef404704..16c56182 100644 --- a/generator.c +++ b/generator.c @@ -99,25 +99,25 @@ static int adapt_block_size(struct file_struct *file, int bsize) /* send a sums struct down a fd */ -static void send_sums(struct sum_struct *s,int f_out) +static void send_sums(struct sum_struct *s, int f_out) { int i; - + /* tell the other guy how many we are going to be doing and how many bytes there are in the last chunk */ - write_int(f_out,s?s->count:0); - write_int(f_out,s?s->n:block_size); - write_int(f_out,s?s->remainder:0); + write_int(f_out, s ? s->count : 0); + write_int(f_out, s ? s->n : block_size); + write_int(f_out, s ? s->remainder : 0); - if (!s) return; + if (!s) + return; - for (i=0;icount;i++) { - write_int(f_out,s->sums[i].sum1); - write_buf(f_out,s->sums[i].sum2,csum_length); + for (i = 0; i < s->count; i++) { + write_int(f_out, s->sums[i].sum1); + write_buf(f_out, s->sums[i].sum2, csum_length); } } - /* generate a stream of signatures/checksums that describe a buffer @@ -357,8 +357,9 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out) if (!dry_run) send_sums(NULL,f_out); } else { if (verbose > 1) - rprintf(FERROR,RSYNC_NAME": recv_generator failed to open \%s\": %s\n",fname, - strerror(errno)); + rprintf(FERROR, RSYNC_NAME + ": recv_generator failed to open \"%s\": %s\n", + fname, strerror(errno)); } return; }