Switched uint64 vars over to int64.

diff --git a/flist.c b/flist.c
index ddf52ec..0e787eb 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -335,7 +335,7 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
        unsigned short flags;
        static time_t modtime;
        static mode_t mode;
-       static uint64 dev;
+       static int64 dev;
        static dev_t rdev;
        static uint32 rdev_major;
        static uid_t uid;
@@ -527,7 +527,7 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
 {
        static time_t modtime;
        static mode_t mode;
-       static uint64 dev;
+       static int64 dev;
        static dev_t rdev;
        static uint32 rdev_major;
        static uid_t uid;
@@ -684,7 +684,7 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
        if (preserve_hard_links && protocol_version < 28 && S_ISREG(mode))
                flags |= XMIT_HAS_IDEV_DATA;
        if (flags & XMIT_HAS_IDEV_DATA) {
-               uint64 inode;
+               int64 inode;
                if (protocol_version < 26) {
                        dev = read_int(f);
                        inode = read_int(f);

diff --git a/generator.c b/generator.c
index 4a22581..7d60f64 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -117,7 +117,7 @@ static int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
  *
  * This might be made one of several selectable heuristics.
  */
-static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
+static void sum_sizes_sqroot(struct sum_struct *sum, int64 len)
 {
        int32 blength;
        int s2length;
@@ -128,7 +128,7 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
                blength = BLOCK_SIZE;
        else {
                int32 c;
-               uint64 l;
+               int64 l;
                int cnt;
                for (c = 1, l = len, cnt = 0; l >>= 2; c <<= 1, cnt++) {}
                if (cnt >= 31 || c >= MAX_BLOCK_SIZE)
@@ -137,7 +137,7 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
                    blength = 0;
                    do {
                            blength |= c;
-                           if (len < (uint64)blength * blength)
+                           if (len < (int64)blength * blength)
                                    blength &= ~c;
                            c >>= 1;
                    } while (c >= 8);   /* round to multiple of 8 */
@@ -151,7 +151,7 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
                s2length = SUM_LENGTH;
        } else {
                int32 c;
-               uint64 l;
+               int64 l;
                int b = BLOCKSUM_BIAS;
                for (l = len; l >>= 1; b += 2) {}
                for (c = blength; c >>= 1 && b; b--) {}

diff --git a/options.c b/options.c
index 587329f..c34047d 100644 (file)
--- a/options.c
+++ b/options.c
@@ -200,7 +200,7 @@ static void print_rsync_version(enum logcode f)
        rprintf(f, "              %sinplace, %sIPv6, %d-bit system inums, %d-bit internal inums\n",
                have_inplace, ipv6,
                (int) (sizeof dumstat->st_ino * 8),
-               (int) (sizeof (uint64) * 8));
+               (int) (sizeof (int64) * 8));
 #ifdef MAINTAINER_MODE
        rprintf(f, "              panic action: \"%s\"\n",
                get_panic_action());