Skip to content

Commit 78cffcd

Browse files
nodejs-github-botRafaelGSS
authored andcommitted
deps: update zlib to 982b036
PR-URL: #48327 Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Mestery <[email protected]> Reviewed-By: Mohammed Keyvanzadeh <[email protected]>
1 parent f1ead59 commit 78cffcd

25 files changed

+910
-1564
lines changed

‎deps/zlib/BUILD.gn‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
#include"zutil.h"
99

10-
localuLongadler32_combine_OF((uLongadler1, uLongadler2, z_off64_tlen2));
11-
1210
#defineBASE 65521U /* largest prime smaller than 65536 */
1311
#defineNMAX 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-
uLongZEXPORTadler32_z(adler, buf, len)
69-
uLongadler;
70-
constBytef*buf;
71-
z_size_tlen;
72-
{
66+
uLongZEXPORTadler32_z(uLongadler, constBytef*buf, z_size_tlen){
7367
unsigned longsum2;
7468
unsignedn;
7569

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

161155
/* ========================================================================= */
162-
uLongZEXPORTadler32(adler, buf, len)
163-
uLongadler;
164-
constBytef*buf;
165-
uIntlen;
166-
{
156+
uLongZEXPORTadler32(uLongadler, constBytef*buf, uIntlen){
167157
returnadler32_z(adler, buf, len);
168158
}
169159

170160
/* ========================================================================= */
171-
localuLongadler32_combine_(adler1, adler2, len2)
172-
uLongadler1;
173-
uLongadler2;
174-
z_off64_tlen2;
175-
{
161+
localuLongadler32_combine_(uLongadler1, uLongadler2, z_off64_tlen2){
176162
unsigned longsum1;
177163
unsigned longsum2;
178164
unsignedrem;
@@ -197,18 +183,10 @@ local uLong adler32_combine_(adler1, adler2, len2)
197183
}
198184

199185
/* ========================================================================= */
200-
uLongZEXPORTadler32_combine(adler1, adler2, len2)
201-
uLongadler1;
202-
uLongadler2;
203-
z_off_tlen2;
204-
{
186+
uLongZEXPORTadler32_combine(uLongadler1, uLongadler2, z_off_tlen2){
205187
returnadler32_combine_(adler1, adler2, len2);
206188
}
207189

208-
uLongZEXPORTadler32_combine64(adler1, adler2, len2)
209-
uLongadler1;
210-
uLongadler2;
211-
z_off64_tlen2;
212-
{
190+
uLongZEXPORTadler32_combine64(uLongadler1, uLongadler2, z_off64_tlen2){
213191
returnadler32_combine_(adler1, adler2, len2);
214192
}

‎deps/zlib/compress.c‎

Lines changed: 5 additions & 16 deletions
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-
intZEXPORTcompress2(dest, destLen, source, sourceLen, level)
23-
Bytef*dest;
24-
uLongf*destLen;
25-
constBytef*source;
26-
uLongsourceLen;
27-
intlevel;
28-
{
22+
intZEXPORTcompress2(Bytef*dest, uLongf*destLen, constBytef*source,
23+
uLongsourceLen, intlevel){
2924
z_streamstream;
3025
interr;
3126
constuIntmax= (uInt)-1;
@@ -65,22 +60,16 @@ int ZEXPORT compress2(dest, destLen, source, sourceLen, level)
6560

6661
/* ===========================================================================
6762
*/
68-
intZEXPORTcompress(dest, destLen, source, sourceLen)
69-
Bytef*dest;
70-
uLongf*destLen;
71-
constBytef*source;
72-
uLongsourceLen;
73-
{
63+
intZEXPORTcompress(Bytef*dest, uLongf*destLen, constBytef*source,
64+
uLongsourceLen){
7465
returncompress2(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-
uLongZEXPORTcompressBound(sourceLen)
82-
uLongsourceLen;
83-
{
72+
uLongZEXPORTcompressBound(uLongsourceLen){
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‎

Lines changed: 1 addition & 4 deletions
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-
voidZLIB_INTERNALinflate_fast_chunk_(strm, start)
76-
z_streampstrm;
77-
unsignedstart; /* inflate()'s starting value for strm->avail_out */
78-
{
75+
voidZLIB_INTERNALinflate_fast_chunk_(z_streampstrm, unsignedstart){
7976
structinflate_stateFAR*state;
8077
z_const unsignedcharFAR*in; /* local strm->next_in */
8178
z_const unsignedcharFAR*last; /* have enough input while in < last */

‎deps/zlib/contrib/optimizations/inffast_chunk.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@
3939
#defineINFLATE_FAST_MIN_OUTPUT 260
4040
#endif
4141

42-
voidZLIB_INTERNALinflate_fast_chunk_OF((z_streampstrm, unsignedstart));
42+
voidZLIB_INTERNALinflate_fast_chunk_(z_streampstrm, unsignedstart);

0 commit comments

Comments
(0)