diff options
author | Nathan Moinvaziri <nathan@nathanm.com> | 2020-08-15 20:06:26 -0700 |
---|---|---|
committer | Hans Kristian Rosbach <hk-github@circlestorm.org> | 2020-08-16 17:37:04 +0200 |
commit | 193d8fd7dfb7927facab7a3034daa27ad5b9df1c (patch) | |
tree | 5c339842008015efb2d13bdc32c25c8595284e0b /adler32.c | |
parent | bcb1d58c05a06c61dac50318bb124413619fb436 (diff) |
Remove NO_DIVIDE from adler32.
Diffstat (limited to 'adler32.c')
-rw-r--r-- | adler32.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -46,8 +46,8 @@ ZLIB_INTERNAL uint32_t adler32_c(uint32_t adler, const unsigned char *buf, size_ buf += 8; #endif } while (--n); - MOD(adler); - MOD(sum2); + adler %= BASE; + sum2 %= BASE; } /* do remaining bytes (less than NMAX, still just one modulo) */ @@ -69,8 +69,8 @@ ZLIB_INTERNAL uint32_t adler32_c(uint32_t adler, const unsigned char *buf, size_ adler += *buf++; sum2 += adler; } - MOD(adler); - MOD(sum2); + adler %= BASE; + sum2 %= BASE; } /* return recombined sums */ @@ -109,11 +109,11 @@ static uint32_t adler32_combine_(uint32_t adler1, uint32_t adler2, z_off64_t len return 0xffffffff; /* the derivation of this formula is left as an exercise for the reader */ - MOD63(len2); /* assumes len2 >= 0 */ + len2 %= BASE; /* assumes len2 >= 0 */ rem = (unsigned)len2; sum1 = adler1 & 0xffff; sum2 = rem * sum1; - MOD(sum2); + sum2 %= BASE; sum1 += (adler2 & 0xffff) + BASE - 1; sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem; if (sum1 >= BASE) sum1 -= BASE; |