ss_bsdiff: Unification of variable types

Change-Id: I328731120dd3dbbe2954a0444b098c331f0d4d48

diff --git a/bsdiff/ss_bsdiff.c b/bsdiff/ss_bsdiff.c
index 3384f9c9046c0c6479eac7d07eb58f2f426bb6d2..9bac2f19653b35971727caa4cc80aad0b40748e6 100644 (file)
--- a/bsdiff/ss_bsdiff.c
+++ b/bsdiff/ss_bsdiff.c
@@ -424,8 +424,8 @@ int Function(int offset_oldscore, uint64_t *block_count)
        lastoffset = 0;
        while (scan < end) {
                oldscore = 0;
-               size_t prev_len;
-               uint64_t prev_pos, prev_oldscore;
+               off_t prev_len;
+               off_t prev_pos, prev_oldscore;
                int num_less_than_eight = 0;
                for (scsc = scan += len; scan < end; scan++) {
                        prev_len = len;
@@ -463,12 +463,12 @@ int Function(int offset_oldscore, uint64_t *block_count)
                         * where large blocks of data differ by less than 8 bytes.
                         * https://android.googlesource.com/platform/external/bsdiff/+/d172820cb8b4513478f0db5546d6e4d388adc1a7
                         */
-                       const size_t fuzz = 8;
+                       const off_t fuzz = 8;
                        if (prev_len - fuzz <= len && len <= prev_len &&
-                           prev_oldscore - fuzz <= (uint64_t)oldscore &&
-                           (uint64_t)oldscore <= prev_oldscore &&
-                           prev_pos <= (uint64_t)pos &&
-                           (uint64_t)pos <= prev_pos + fuzz &&
+                           prev_oldscore - fuzz <= oldscore &&
+                           oldscore <= prev_oldscore &&
+                           prev_pos <= pos &&
+                           pos <= prev_pos + fuzz &&
                            oldscore <= len && len <= oldscore + fuzz) {
                                num_less_than_eight++;
                        } else {