Fix copyright.

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index 39bb279..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;
@@ -83,9 +83,9 @@ static struct sum_struct *receive_sums(int f)
 
 void send_files(struct file_list *flist,int f_out,int f_in)
 { 
-       int fd;
+       int fd = -1;
        struct sum_struct *s;
-       struct map_struct *buf;
+       struct map_struct *buf = NULL;
        STRUCT_STAT st;
        char fname[MAXPATHLEN];  
        int i;
@@ -94,7 +94,6 @@ void send_files(struct file_list *flist,int f_out,int f_in)
        extern struct stats stats;              
        struct stats initial_stats;
        extern int write_batch;   /* dw */
-       int negative_one;  /* dw */
        extern int read_batch;    /* dw */
        int checksums_match;   /* dw */
        int buff_len;  /* dw */
@@ -160,53 +159,52 @@ 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);
-               if (fd == -1) {
-                       io_error = 1;
-                       rprintf(FERROR,"send_files failed to open %s: %s\n",
-                               fname,strerror(errno));
-                       free_sums(s);
-                       continue;
-               }
+                       fd = do_open(fname, O_RDONLY, 0);
+                       if (fd == -1) {
+                               io_error = 1;
+                               rprintf(FERROR,"send_files failed to open %s: %s\n",
+                                       fname,strerror(errno));
+                               free_sums(s);
+                               continue;
+                       }
          
-               /* map the local file */
-               if (do_fstat(fd,&st) != 0) {
-                       io_error = 1;
-                       rprintf(FERROR,"fstat failed : %s\n",strerror(errno));
-                       free_sums(s);
-                       close(fd);
-                       return;
-               }
+                       /* map the local file */
+                       if (do_fstat(fd,&st) != 0) {
+                               io_error = 1;
+                               rprintf(FERROR,"fstat failed : %s\n",strerror(errno));
+                               free_sums(s);
+                               close(fd);
+                               return;
+                       }
          
-               if (st.st_size > 0) {
-                       buf = map_file(fd,st.st_size);
-               } else {
-                       buf = NULL;
-               }
+                       if (st.st_size > 0) {
+                               buf = map_file(fd,st.st_size);
+                       } else {
+                               buf = NULL;
+                       }
          
-               if (verbose > 2)
-                       rprintf(FINFO,"send_files mapped %s of size %.0f\n",
-                               fname,(double)st.st_size);
-               }
+                       if (verbose > 2)
+                               rprintf(FINFO,"send_files mapped %s of size %.0f\n",
+                                       fname,(double)st.st_size);
 
-               if (!read_batch) { /* dw */
-                   write_int(f_out,i);
+                       write_int(f_out,i);
          
-                   if (write_batch)
-                       write_batch_delta_file((char *)&i,sizeof(i));
+                       if (write_batch)
+                               write_batch_delta_file((char *)&i,sizeof(i));
 
-                   write_int(f_out,s->count);
-                   write_int(f_out,s->n);
-                   write_int(f_out,s->remainder);
+                       write_int(f_out,s->count);
+                       write_int(f_out,s->n);
+                       write_int(f_out,s->remainder);
                }
          
                if (verbose > 2)
@@ -255,8 +253,9 @@ void send_files(struct file_list *flist,int f_out,int f_in)
 
                        }  /* j=i */
                    } else {  /* not checksum match */
-                      rprintf(FINFO,"readbatch & checksums don't match\n");
-                      rprintf(FINFO,"filename=%s is being skipped\n");
+                      rprintf (FINFO,"readbatch & checksums don't match\n");
+                      rprintf (FINFO,"filename=%s is being skipped\n",
+                              fname);
                       continue;
                    }
                 } else  {