Skip to content

Commit 38f6e0d

Browse files
nodejs-github-botruyadorno
authored andcommitted
deps: update zlib to 982b036
PR-URL: #48327 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Mestery <mestery@protonmail.com> Reviewed-By: Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com>
1 parent f35c4d3 commit 38f6e0d

25 files changed

+910
-1564
lines changed

deps/zlib/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ component("zlib") {
359359
if (is_android) {
360360
import("//build/config/android/config.gni")
361361
if (defined(android_ndk_root) && android_ndk_root != "") {
362-
deps += [ "//third_party/android_ndk:cpu_features" ]
362+
deps += [ "//third_party/cpu_features:ndk_compat" ]
363363
} else {
364364
assert(false, "CPU detection requires the Android NDK")
365365
}

deps/zlib/adler32.c

+5-27
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
#include "zutil.h"
99

10-
local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
11-
1210
#define BASE 65521U /* largest prime smaller than 65536 */
1311
#define NMAX 5552
1412
/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
@@ -65,11 +63,7 @@ local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
6563
#endif
6664

6765
/* ========================================================================= */
68-
uLong ZEXPORT adler32_z(adler, buf, len)
69-
uLong adler;
70-
const Bytef *buf;
71-
z_size_t len;
72-
{
66+
uLong ZEXPORT adler32_z(uLong adler, const Bytef *buf, z_size_t len) {
7367
unsigned long sum2;
7468
unsigned n;
7569

@@ -159,20 +153,12 @@ uLong ZEXPORT adler32_z(adler, buf, len)
159153
}
160154

161155
/* ========================================================================= */
162-
uLong ZEXPORT adler32(adler, buf, len)
163-
uLong adler;
164-
const Bytef *buf;
165-
uInt len;
166-
{
156+
uLong ZEXPORT adler32(uLong adler, const Bytef *buf, uInt len) {
167157
return adler32_z(adler, buf, len);
168158
}
169159

170160
/* ========================================================================= */
171-
local uLong adler32_combine_(adler1, adler2, len2)
172-
uLong adler1;
173-
uLong adler2;
174-
z_off64_t len2;
175-
{
161+
local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2) {
176162
unsigned long sum1;
177163
unsigned long sum2;
178164
unsigned rem;
@@ -197,18 +183,10 @@ local uLong adler32_combine_(adler1, adler2, len2)
197183
}
198184

199185
/* ========================================================================= */
200-
uLong ZEXPORT adler32_combine(adler1, adler2, len2)
201-
uLong adler1;
202-
uLong adler2;
203-
z_off_t len2;
204-
{
186+
uLong ZEXPORT adler32_combine(uLong adler1, uLong adler2, z_off_t len2) {
205187
return adler32_combine_(adler1, adler2, len2);
206188
}
207189

208-
uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
209-
uLong adler1;
210-
uLong adler2;
211-
z_off64_t len2;
212-
{
190+
uLong ZEXPORT adler32_combine64(uLong adler1, uLong adler2, z_off64_t len2) {
213191
return adler32_combine_(adler1, adler2, len2);
214192
}

deps/zlib/compress.c

+5-16
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,8 @@
1919
memory, Z_BUF_ERROR if there was not enough room in the output buffer,
2020
Z_STREAM_ERROR if the level parameter is invalid.
2121
*/
22-
int ZEXPORT compress2(dest, destLen, source, sourceLen, level)
23-
Bytef *dest;
24-
uLongf *destLen;
25-
const Bytef *source;
26-
uLong sourceLen;
27-
int level;
28-
{
22+
int ZEXPORT compress2(Bytef *dest, uLongf *destLen, const Bytef *source,
23+
uLong sourceLen, int level) {
2924
z_stream stream;
3025
int err;
3126
const uInt max = (uInt)-1;
@@ -65,22 +60,16 @@ int ZEXPORT compress2(dest, destLen, source, sourceLen, level)
6560

6661
/* ===========================================================================
6762
*/
68-
int ZEXPORT compress(dest, destLen, source, sourceLen)
69-
Bytef *dest;
70-
uLongf *destLen;
71-
const Bytef *source;
72-
uLong sourceLen;
73-
{
63+
int ZEXPORT compress(Bytef *dest, uLongf *destLen, const Bytef *source,
64+
uLong sourceLen) {
7465
return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
7566
}
7667

7768
/* ===========================================================================
7869
If the default memLevel or windowBits for deflateInit() is changed, then
7970
this function needs to be updated.
8071
*/
81-
uLong ZEXPORT compressBound(sourceLen)
82-
uLong sourceLen;
83-
{
72+
uLong ZEXPORT compressBound(uLong sourceLen) {
8473
sourceLen = sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
8574
(sourceLen >> 25) + 13;
8675
/* FIXME(cavalcantii): usage of CRC32 Castagnoli as a hash function

deps/zlib/contrib/optimizations/inffast_chunk.c

+1-4
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,7 @@
7272
requires strm->avail_out >= 260 for each loop to avoid checking for
7373
available output space while decoding.
7474
*/
75-
void ZLIB_INTERNAL inflate_fast_chunk_(strm, start)
76-
z_streamp strm;
77-
unsigned start; /* inflate()'s starting value for strm->avail_out */
78-
{
75+
void ZLIB_INTERNAL inflate_fast_chunk_(z_streamp strm, unsigned start) {
7976
struct inflate_state FAR *state;
8077
z_const unsigned char FAR *in; /* local strm->next_in */
8178
z_const unsigned char FAR *last; /* have enough input while in < last */

deps/zlib/contrib/optimizations/inffast_chunk.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@
3939
#define INFLATE_FAST_MIN_OUTPUT 260
4040
#endif
4141

42-
void ZLIB_INTERNAL inflate_fast_chunk_ OF((z_streamp strm, unsigned start));
42+
void ZLIB_INTERNAL inflate_fast_chunk_(z_streamp strm, unsigned start);

0 commit comments

Comments
 (0)