If -w and -v are both on, don't output the "log the transfer"

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index 1cf4365..a3cdff4 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -20,6 +20,7 @@
 #include "rsync.h"
 
 extern int verbose;
+extern int what_has_changed;
 extern int csum_length;
 extern struct stats stats;
 extern int io_error;
@@ -47,7 +48,7 @@ extern struct stats stats;
 static struct sum_struct *receive_sums(int f)
 {
        struct sum_struct *s;
-       int i;
+       int32 i;
        OFF_T offset = 0;
 
        if (!(s = new(struct sum_struct)))
@@ -68,14 +69,14 @@ static struct sum_struct *receive_sums(int f)
        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 < 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].flags = 0;
 
-               if (i == (int)s->count-1 && s->remainder != 0)
+               if (i == s->count-1 && s->remainder != 0)
                        s->sums[i].len = s->remainder;
                else
                        s->sums[i].len = s->blength;
@@ -167,8 +168,8 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                if (verbose > 2)
                        rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
 
-               if (dry_run) {
-                       if (!am_server && verbose) /* log the transfer */
+               if (dry_run) { /* log the transfer */
+                       if (!am_server && verbose && !what_has_changed)
                                rprintf(FINFO, "%s\n", safe_fname(fname2));
                        write_int(f_out, i);
                        continue;
@@ -229,7 +230,8 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                                safe_fname(fname));
                }
 
-               if (!am_server && verbose) /* log the transfer */
+               /* log the transfer */
+               if (!am_server && verbose && !what_has_changed)
                        rprintf(FINFO, "%s\n", safe_fname(fname2));
 
                set_compression(fname);