Made the types used in the sum_buf and sum_struct structures consistent

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index 315809e..b7ebbe1 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -47,8 +47,8 @@ void read_sum_head(int f, struct sum_struct *sum)
        } else {
                sum->s2length = read_int(f);
                if (sum->s2length > MD4_SUM_LENGTH) {
-                       rprintf(FERROR, "Invalid checksum length %d\n",
-                           sum->s2length);
+                       rprintf(FERROR, "Invalid checksum length %ld\n",
+                           (long)sum->s2length);
                        exit_cleanup(RERR_PROTOCOL);
                }
        }
@@ -71,10 +71,10 @@ static struct sum_struct *receive_sums(int f)
 
        s->sums = NULL;
 
-       if (verbose > 3)
-               rprintf(FINFO, "count=%ld n=%ld rem=%ld\n",
-                       (long) s->count, (long) s->blength,
-                       (long) s->remainder);
+       if (verbose > 3) {
+               rprintf(FINFO, "count=%ld n=%u rem=%u\n",
+                       (long)s->count, s->blength, s->remainder);
+       }
 
        if (s->count == 0)
                return(s);
@@ -120,13 +120,13 @@ void send_files(struct file_list *flist, int f_out, int f_in)
        int phase = 0;
        extern struct stats stats;
        struct stats initial_stats;
-       extern int write_batch;   /* dw */
-       extern int read_batch;    /* dw */
-       int checksums_match;   /* dw */
-       int buff_len;  /* dw */
-       char buff[CHUNK_SIZE];    /* dw */
-       int j;   /* dw */
-       int done;   /* dw */
+       extern int write_batch;
+       extern int read_batch;
+       int checksums_match;
+       int buff_len;
+       char buff[CHUNK_SIZE];
+       int j;
+       int done;
 
        if (verbose > 2)
                rprintf(FINFO, "send_files starting\n");
@@ -170,7 +170,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                        strlcat(fname, "/", MAXPATHLEN);
                        offset = strlen(file->basedir)+1;
                }
-               strlcat(fname, f_name(file), MAXPATHLEN);
+               f_name_to(file, fname + offset, MAXPATHLEN - offset);
 
                if (verbose > 2)
                        rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
@@ -201,7 +201,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                                if (errno == ENOENT) {
                                        io_error |= IOERR_VANISHED;
                                        rprintf(FINFO, "file has vanished: %s\n",
-                                               full_fname(fname));
+                                               full_fname(fname));
                                } else {
                                        io_error |= IOERR_GENERAL;
                                        rprintf(FERROR, "send_files failed to open %s: %s\n",
@@ -247,11 +247,11 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 
                set_compression(fname);
 
-               if (read_batch) { /* dw */
+               if (read_batch) {
                        /* read checksums originally computed on sender side */
                        read_batch_csum_info(i, s, &checksums_match);
                        if (checksums_match) {
-                               read_batch_delta_file( (char *) &j, sizeof(int) );
+                               read_batch_delta_file((char*)&j, sizeof (int));
                                if (j != i) {    /* if flist index entries don't match*/
                                        rprintf(FINFO, "index mismatch in send_files\n");
                                        rprintf(FINFO, "read index = %d flist ndx = %d\n", j, i);
@@ -263,7 +263,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                                        write_sum_head(f_out, s);
                                        done = 0;
                                        while (!done) {
-                                               read_batch_delta_file( (char *) &buff_len, sizeof(int) );
+                                               read_batch_delta_file((char*)&buff_len, sizeof (int));
                                                write_int(f_out, buff_len);
                                                if (buff_len == 0) {
                                                        done = 1;
@@ -288,7 +288,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                        log_send(file, &initial_stats);
                }
 
-               if (!read_batch) { /* dw */
+               if (!read_batch) {
                        if (buf) {
                                j = unmap_file(buf);
                                if (j) {
@@ -313,7 +313,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
        match_report();
 
        write_int(f_out, -1);
-       if (write_batch || read_batch) { /* dw */
+       if (write_batch || read_batch) {
                close_batch_csums_file();
                close_batch_delta_file();
        }