Split code out into separate files and remove some global variables to

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index ee34bc9..ca853ef 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -55,14 +55,14 @@ static struct sum_struct *receive_sums(int f)
        s->sums = (struct sum_buf *)malloc(sizeof(s->sums[0])*s->count);
        if (!s->sums) out_of_memory("receive_sums");
 
-       for (i=0;i<s->count;i++) {
+       for (i=0; i < (int) s->count;i++) {
                s->sums[i].sum1 = read_int(f);
                read_buf(f,s->sums[i].sum2,csum_length);
 
                s->sums[i].offset = offset;
                s->sums[i].i = i;
 
-               if (i == s->count-1 && s->remainder != 0) {
+               if (i == (int) s->count-1 && s->remainder != 0) {
                        s->sums[i].len = s->remainder;
                } else {
                        s->sums[i].len = s->n;
@@ -159,13 +159,14 @@ void send_files(struct file_list *flist,int f_out,int f_in)
                initial_stats = stats;
 
                s = receive_sums(f_in);
-               if (write_batch) /* dw */
-                   write_batch_csum_info(&i,flist->count,s);
                if (!s) {
                        io_error = 1;
                        rprintf(FERROR,"receive_sums failed\n");
                        return;
                }
+
+               if (write_batch)
+                   write_batch_csum_info(&i,flist->count,s);
          
                if (!read_batch) {
                        fd = do_open(fname, O_RDONLY, 0);