Cast various s->blength references inside of MIN() macros to OFF_T

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index aca5f7b..48273f0 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -155,7 +155,7 @@ static void sum_sizes_sqroot_baarda(struct sum_struct *sum, uint64 len)
                blength = 0;
                do {
                        blength |= c;
-                       if (len < (uint64)(blength * blength))
+                       if (len < (uint64)blength * blength)
                                blength &= ~c;
                        c >>= 1;
                } while (c >= 8);       /* round to multiple of 8 */
@@ -247,8 +247,8 @@ static void generate_and_send_sums(struct map_struct *buf, OFF_T len, int f_out)
 
                if (verbose > 3) {
                        rprintf(FINFO,
-                               "chunk[%d] offset=%.0f len=%d sum1=%08lx\n",
-                               i, (double) offset, n1, (unsigned long) sum1);
+                               "chunk[%ld] offset=%.0f len=%d sum1=%08lx\n",
+                               (long)i,(double)offset,n1,(unsigned long)sum1);
                }
                write_int(f_out, sum1);
                write_buf(f_out, sum2, sum.s2length);
@@ -383,7 +383,7 @@ void recv_generator(char *fname, struct file_list *flist, int i, int f_out)
        if (am_root && preserve_devices && IS_DEVICE(file->mode)) {
                if (statret != 0 ||
                    st.st_mode != file->mode ||
-                   st.st_rdev != file->rdev) {
+                   (DEV64_T)st.st_rdev != file->rdev) {
                        delete_file(fname);
                        if (verbose > 2)
                                rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",