diff options
author | DLL125 <134442578+DLL125@users.noreply.github.com> | 2023-08-20 09:21:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-20 09:21:54 +0200 |
commit | 4f92ba548445e84bab61e06f89ee1e341a92f716 (patch) | |
tree | c4409ca025048e7b6f99555b22b026ec5898e06e /src/Common/zlib/adler32.c | |
parent | 89d340271c4d584b649eb9974f15a1ee557c91a1 (diff) | |
download | VeraCrypt-4f92ba548445e84bab61e06f89ee1e341a92f716.tar.gz VeraCrypt-4f92ba548445e84bab61e06f89ee1e341a92f716.zip |
Update zlib to latest (#1181)
* Update zlib to latest
* Update copyright
Updated copyright of zlib.
Diffstat (limited to 'src/Common/zlib/adler32.c')
-rw-r--r-- | src/Common/zlib/adler32.c | 32 |
1 files changed, 5 insertions, 27 deletions
diff --git a/src/Common/zlib/adler32.c b/src/Common/zlib/adler32.c index d0be4380..04b81d29 100644 --- a/src/Common/zlib/adler32.c +++ b/src/Common/zlib/adler32.c @@ -7,8 +7,6 @@ #include "zutil.h" -local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2)); - #define BASE 65521U /* largest prime smaller than 65536 */ #define NMAX 5552 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ @@ -60,11 +58,7 @@ local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2)); #endif /* ========================================================================= */ -uLong ZEXPORT adler32_z(adler, buf, len) - uLong adler; - const Bytef *buf; - z_size_t len; -{ +uLong ZEXPORT adler32_z(uLong adler, const Bytef *buf, z_size_t len) { unsigned long sum2; unsigned n; @@ -131,20 +125,12 @@ uLong ZEXPORT adler32_z(adler, buf, len) } /* ========================================================================= */ -uLong ZEXPORT adler32(adler, buf, len) - uLong adler; - const Bytef *buf; - uInt len; -{ +uLong ZEXPORT adler32(uLong adler, const Bytef *buf, uInt len) { return adler32_z(adler, buf, len); } /* ========================================================================= */ -local uLong adler32_combine_(adler1, adler2, len2) - uLong adler1; - uLong adler2; - z_off64_t len2; -{ +local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2) { unsigned long sum1; unsigned long sum2; unsigned rem; @@ -169,18 +155,10 @@ local uLong adler32_combine_(adler1, adler2, len2) } /* ========================================================================= */ -uLong ZEXPORT adler32_combine(adler1, adler2, len2) - uLong adler1; - uLong adler2; - z_off_t len2; -{ +uLong ZEXPORT adler32_combine(uLong adler1, uLong adler2, z_off_t len2) { return adler32_combine_(adler1, adler2, len2); } -uLong ZEXPORT adler32_combine64(adler1, adler2, len2) - uLong adler1; - uLong adler2; - z_off64_t len2; -{ +uLong ZEXPORT adler32_combine64(uLong adler1, uLong adler2, z_off64_t len2) { return adler32_combine_(adler1, adler2, len2); } |