Call map_file() with its new block_size arg.

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index 9fe5f62..211aec2 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -27,6 +27,7 @@ extern int dry_run;
 extern int am_server;
 extern int am_daemon;
 extern int protocol_version;
+extern struct stats stats;
 
 
 /**
@@ -62,8 +63,8 @@ static struct sum_struct *receive_sums(int f)
        int i;
        OFF_T offset = 0;
 
-       s = new(struct sum_struct);
-       if (!s) out_of_memory("receive_sums");
+       if (!(s = new(struct sum_struct)))
+               out_of_memory("receive_sums");
 
        read_sum_head(f, s);
 
@@ -77,26 +78,28 @@ static struct sum_struct *receive_sums(int f)
        if (s->count == 0)
                return(s);
 
-       s->sums = new_array(struct sum_buf, s->count);
-       if (!s->sums) out_of_memory("receive_sums");
+       if (!(s->sums = new_array(struct sum_buf, s->count)))
+               out_of_memory("receive_sums");
 
-       for (i = 0; i < (int) 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, s->s2length);
 
                s->sums[i].offset = offset;
-               s->sums[i].i = i;
+               s->sums[i].flags = 0;
 
-               if (i == (int) s->count-1 && s->remainder != 0) {
+               if (i == (int)s->count-1 && s->remainder != 0)
                        s->sums[i].len = s->remainder;
-               } else {
+               else
                        s->sums[i].len = s->blength;
-               }
                offset += s->sums[i].len;
 
-               if (verbose > 3)
-                       rprintf(FINFO, "chunk[%d] len=%d offset=%.0f sum1=%08x\n",
-                               i, s->sums[i].len, (double)s->sums[i].offset, s->sums[i].sum1);
+               if (verbose > 3) {
+                       rprintf(FINFO,
+                               "chunk[%d] len=%d offset=%.0f sum1=%08x\n",
+                               i, s->sums[i].len, (double)s->sums[i].offset,
+                               s->sums[i].sum1);
+               }
        }
 
        s->flength = offset;
@@ -116,7 +119,6 @@ void send_files(struct file_list *flist, int f_out, int f_in)
        int i;
        struct file_struct *file;
        int phase = 0;
-       extern struct stats stats;
        struct stats initial_stats;
        int j;
 
@@ -173,8 +175,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 
                initial_stats = stats;
 
-               s = receive_sums(f_in);
-               if (!s) {
+               if (!(s = receive_sums(f_in))) {
                        io_error |= IOERR_GENERAL;
                        rprintf(FERROR, "receive_sums failed\n");
                        return;
@@ -208,7 +209,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                        return;
                }
 
-               mbuf = st.st_size ? map_file(fd, st.st_size) : NULL;
+               mbuf = st.st_size ? map_file(fd, st.st_size, s->blength) : NULL;
 
                if (verbose > 2) {
                        rprintf(FINFO, "send_files mapped %s of size %.0f\n",