Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
fd78cc32
Commit
fd78cc32
authored
Aug 30, 2023
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update to zlib 1.3
parent
59945b9d
Changes
11
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
616 additions
and
1068 deletions
+616
-1068
adler32.c
lib/libvgz/adler32.c
+6
-31
crc32.c
lib/libvgz/crc32.c
+82
-176
deflate.c
lib/libvgz/deflate.c
+228
-345
gzguts.h
lib/libvgz/gzguts.h
+1
-2
inffast.c
lib/libvgz/inffast.c
+1
-5
inflate.c
lib/libvgz/inflate.c
+30
-112
inftrees.c
lib/libvgz/inftrees.c
+6
-12
trees.c
lib/libvgz/trees.c
+223
-323
vgz.h
lib/libvgz/vgz.h
+20
-17
zconf.h
lib/libvgz/zconf.h
+6
-2
zutil.c
lib/libvgz/zutil.c
+13
-43
No files found.
lib/libvgz/adler32.c
View file @
fd78cc32
...
...
@@ -61,11 +61,7 @@ local uLong adler32_combine_ (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
;
...
...
@@ -132,20 +128,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
;
...
...
@@ -170,28 +158,15 @@ 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
);
}
#else
/* NOVGZ */
uLong
ZEXPORT
adler32
(
uLong
adler
,
const
Bytef
*
buf
,
uInt
len
)
{
uLong
ZEXPORT
adler32
(
uLong
adler
,
const
Bytef
*
buf
,
uInt
len
)
{
(
void
)
adler
;
(
void
)
buf
;
(
void
)
len
;
...
...
lib/libvgz/crc32.c
View file @
fd78cc32
This diff is collapsed.
Click to expand it.
lib/libvgz/deflate.c
View file @
fd78cc32
This diff is collapsed.
Click to expand it.
lib/libvgz/gzguts.h
View file @
fd78cc32
...
...
@@ -7,9 +7,8 @@
# ifndef _LARGEFILE_SOURCE
# define _LARGEFILE_SOURCE 1
# endif
# ifdef _FILE_OFFSET_BITS
# undef _FILE_OFFSET_BITS
#
endif
#
undef _TIME_BITS
#endif
#ifdef HAVE_HIDDEN
...
...
lib/libvgz/inffast.c
View file @
fd78cc32
...
...
@@ -47,11 +47,7 @@
requires strm->avail_out >= 258 for each loop to avoid checking for
output space.
*/
void
ZLIB_INTERNAL
inflate_fast
(
z_streamp
strm
,
unsigned
start
/* inflate()'s starting value for strm->avail_out */
)
{
void
ZLIB_INTERNAL
inflate_fast
(
z_streamp
strm
,
unsigned
start
)
{
struct
inflate_state
FAR
*
state
;
z_const
unsigned
char
FAR
*
in
;
/* local strm->next_in */
z_const
unsigned
char
FAR
*
last
;
/* have enough input while in < last */
...
...
lib/libvgz/inflate.c
View file @
fd78cc32
...
...
@@ -91,23 +91,7 @@
# endif
#endif
/* function prototypes */
local
int
inflateStateCheck
(
z_streamp
strm
);
local
void
fixedtables
(
struct
inflate_state
FAR
*
state
);
local
int
updatewindow
(
z_streamp
strm
,
const
unsigned
char
FAR
*
end
,
unsigned
copy
);
#ifdef BUILDFIXED
void
makefixed
(
void
);
#endif
#ifdef NOVGZ
local
unsigned
syncsearch
(
unsigned
FAR
*
have
,
const
unsigned
char
FAR
*
buf
,
unsigned
len
);
#endif
/* NOVGZ */
local
int
inflateStateCheck
(
z_streamp
strm
)
{
local
int
inflateStateCheck
(
z_streamp
strm
)
{
struct
inflate_state
FAR
*
state
;
if
(
strm
==
Z_NULL
||
strm
->
zalloc
==
(
alloc_func
)
0
||
strm
->
zfree
==
(
free_func
)
0
)
...
...
@@ -119,10 +103,7 @@ local int inflateStateCheck(
return
0
;
}
int
ZEXPORT
inflateResetKeep
(
z_streamp
strm
)
{
int
ZEXPORT
inflateResetKeep
(
z_streamp
strm
)
{
struct
inflate_state
FAR
*
state
;
if
(
inflateStateCheck
(
strm
))
return
Z_STREAM_ERROR
;
...
...
@@ -147,10 +128,7 @@ int ZEXPORT inflateResetKeep(
return
Z_OK
;
}
int
ZEXPORT
inflateReset
(
z_streamp
strm
)
{
int
ZEXPORT
inflateReset
(
z_streamp
strm
)
{
struct
inflate_state
FAR
*
state
;
if
(
inflateStateCheck
(
strm
))
return
Z_STREAM_ERROR
;
...
...
@@ -161,11 +139,7 @@ int ZEXPORT inflateReset(
return
inflateResetKeep
(
strm
);
}
int
ZEXPORT
inflateReset2
(
z_streamp
strm
,
int
windowBits
)
{
int
ZEXPORT
inflateReset2
(
z_streamp
strm
,
int
windowBits
)
{
int
wrap
;
struct
inflate_state
FAR
*
state
;
...
...
@@ -202,13 +176,8 @@ int ZEXPORT inflateReset2(
return
inflateReset
(
strm
);
}
int
ZEXPORT
inflateInit2_
(
z_streamp
strm
,
int
windowBits
,
const
char
*
version
,
int
stream_size
)
{
int
ZEXPORT
inflateInit2_
(
z_streamp
strm
,
int
windowBits
,
const
char
*
version
,
int
stream_size
)
{
int
ret
;
struct
inflate_state
FAR
*
state
;
...
...
@@ -249,24 +218,17 @@ int ZEXPORT inflateInit2_(
#ifdef NOVGZ
int
ZEXPORT
inflateInit_
(
z_streamp
strm
,
const
char
*
version
,
int
stream_size
)
{
int
ZEXPORT
inflateInit_
(
z_streamp
strm
,
const
char
*
version
,
int
stream_size
)
{
return
inflateInit2_
(
strm
,
DEF_WBITS
,
version
,
stream_size
);
}
int
ZEXPORT
inflatePrime
(
z_streamp
strm
,
int
bits
,
int
value
)
{
int
ZEXPORT
inflatePrime
(
z_streamp
strm
,
int
bits
,
int
value
)
{
struct
inflate_state
FAR
*
state
;
if
(
inflateStateCheck
(
strm
))
return
Z_STREAM_ERROR
;
if
(
bits
==
0
)
return
Z_OK
;
state
=
(
struct
inflate_state
FAR
*
)
strm
->
state
;
if
(
bits
<
0
)
{
state
->
hold
=
0
;
...
...
@@ -292,10 +254,7 @@ int ZEXPORT inflatePrime(
used for threaded applications, since the rewriting of the tables and virgin
may not be thread-safe.
*/
local
void
fixedtables
(
struct
inflate_state
FAR
*
state
)
{
local
void
fixedtables
(
struct
inflate_state
FAR
*
state
)
{
#ifdef BUILDFIXED
static
int
virgin
=
1
;
static
code
*
lenfix
,
*
distfix
;
...
...
@@ -357,7 +316,7 @@ local void fixedtables(
a.out > inffixed.h
*/
void
makefixed
()
void
makefixed
(
void
)
{
unsigned
low
,
size
;
struct
inflate_state
state
;
...
...
@@ -411,12 +370,7 @@ void makefixed()
output will fall in the output data, making match copies simpler and faster.
The advantage may be dependent on the size of the processor's data caches.
*/
local
int
updatewindow
(
z_streamp
strm
,
const
Bytef
*
end
,
unsigned
copy
)
{
local
int
updatewindow
(
z_streamp
strm
,
const
Bytef
*
end
,
unsigned
copy
)
{
struct
inflate_state
FAR
*
state
;
unsigned
dist
;
...
...
@@ -638,11 +592,7 @@ local int updatewindow(
will return Z_BUF_ERROR if it has not reached the end of the stream.
*/
int
ZEXPORT
inflate
(
z_streamp
strm
,
int
flush
)
{
int
ZEXPORT
inflate
(
z_streamp
strm
,
int
flush
)
{
struct
inflate_state
FAR
*
state
;
z_const
unsigned
char
FAR
*
next
;
/* next input */
unsigned
char
FAR
*
put
;
/* next output */
...
...
@@ -1323,10 +1273,7 @@ int ZEXPORT inflate(
return
ret
;
}
int
ZEXPORT
inflateEnd
(
z_streamp
strm
)
{
int
ZEXPORT
inflateEnd
(
z_streamp
strm
)
{
struct
inflate_state
FAR
*
state
;
if
(
inflateStateCheck
(
strm
))
return
Z_STREAM_ERROR
;
...
...
@@ -1340,11 +1287,8 @@ int ZEXPORT inflateEnd(
#ifdef NOVGZ
int
ZEXPORT
inflateGetDictionary
(
strm
,
dictionary
,
dictLength
)
z_streamp
strm
;
Bytef
*
dictionary
;
uInt
*
dictLength
;
{
int
ZEXPORT
inflateGetDictionary
(
z_streamp
strm
,
Bytef
*
dictionary
,
uInt
*
dictLength
)
{
struct
inflate_state
FAR
*
state
;
/* check state */
...
...
@@ -1363,11 +1307,8 @@ uInt *dictLength;
return
Z_OK
;
}
int
ZEXPORT
inflateSetDictionary
(
strm
,
dictionary
,
dictLength
)
z_streamp
strm
;
const
Bytef
*
dictionary
;
uInt
dictLength
;
{
int
ZEXPORT
inflateSetDictionary
(
z_streamp
strm
,
const
Bytef
*
dictionary
,
uInt
dictLength
)
{
struct
inflate_state
FAR
*
state
;
unsigned
long
dictid
;
int
ret
;
...
...
@@ -1398,10 +1339,7 @@ uInt dictLength;
return
Z_OK
;
}
int
ZEXPORT
inflateGetHeader
(
strm
,
head
)
z_streamp
strm
;
gz_headerp
head
;
{
int
ZEXPORT
inflateGetHeader
(
z_streamp
strm
,
gz_headerp
head
)
{
struct
inflate_state
FAR
*
state
;
/* check state */
...
...
@@ -1426,11 +1364,8 @@ gz_headerp head;
called again with more data and the *have state. *have is initialized to
zero for the first call.
*/
local
unsigned
syncsearch
(
have
,
buf
,
len
)
unsigned
FAR
*
have
;
const
unsigned
char
FAR
*
buf
;
unsigned
len
;
{
local
unsigned
syncsearch
(
unsigned
FAR
*
have
,
const
unsigned
char
FAR
*
buf
,
unsigned
len
)
{
unsigned
got
;
unsigned
next
;
...
...
@@ -1449,9 +1384,7 @@ unsigned len;
return
next
;
}
int
ZEXPORT
inflateSync
(
strm
)
z_streamp
strm
;
{
int
ZEXPORT
inflateSync
(
z_streamp
strm
)
{
unsigned
len
;
/* number of bytes to look at or looked at */
int
flags
;
/* temporary to save header status */
unsigned
long
in
,
out
;
/* temporary to save total_in and total_out */
...
...
@@ -1507,9 +1440,7 @@ z_streamp strm;
block. When decompressing, PPP checks that at the end of input packet,
inflate is waiting for these length bytes.
*/
int
ZEXPORT
inflateSyncPoint
(
strm
)
z_streamp
strm
;
{
int
ZEXPORT
inflateSyncPoint
(
z_streamp
strm
)
{
struct
inflate_state
FAR
*
state
;
if
(
inflateStateCheck
(
strm
))
return
Z_STREAM_ERROR
;
...
...
@@ -1517,10 +1448,7 @@ z_streamp strm;
return
state
->
mode
==
STORED
&&
state
->
bits
==
0
;
}
int
ZEXPORT
inflateCopy
(
dest
,
source
)
z_streamp
dest
;
z_streamp
source
;
{
int
ZEXPORT
inflateCopy
(
z_streamp
dest
,
z_streamp
source
)
{
struct
inflate_state
FAR
*
state
;
struct
inflate_state
FAR
*
copy
;
unsigned
char
FAR
*
window
;
...
...
@@ -1564,10 +1492,7 @@ z_streamp source;
return
Z_OK
;
}
int
ZEXPORT
inflateUndermine
(
strm
,
subvert
)
z_streamp
strm
;
int
subvert
;
{
int
ZEXPORT
inflateUndermine
(
z_streamp
strm
,
int
subvert
)
{
struct
inflate_state
FAR
*
state
;
if
(
inflateStateCheck
(
strm
))
return
Z_STREAM_ERROR
;
...
...
@@ -1582,10 +1507,7 @@ int subvert;
#endif
}
int
ZEXPORT
inflateValidate
(
strm
,
check
)
z_streamp
strm
;
int
check
;
{
int
ZEXPORT
inflateValidate
(
z_streamp
strm
,
int
check
)
{
struct
inflate_state
FAR
*
state
;
if
(
inflateStateCheck
(
strm
))
return
Z_STREAM_ERROR
;
...
...
@@ -1597,9 +1519,7 @@ int check;
return
Z_OK
;
}
long
ZEXPORT
inflateMark
(
strm
)
z_streamp
strm
;
{
long
ZEXPORT
inflateMark
(
z_streamp
strm
)
{
struct
inflate_state
FAR
*
state
;
if
(
inflateStateCheck
(
strm
))
...
...
@@ -1610,9 +1530,7 @@ z_streamp strm;
(
state
->
mode
==
MATCH
?
state
->
was
-
state
->
length
:
0
));
}
unsigned
long
ZEXPORT
inflateCodesUsed
(
strm
)
z_streamp
strm
;
{
unsigned
long
ZEXPORT
inflateCodesUsed
(
z_streamp
strm
)
{
struct
inflate_state
FAR
*
state
;
if
(
inflateStateCheck
(
strm
))
return
(
unsigned
long
)
-
1
;
state
=
(
struct
inflate_state
FAR
*
)
strm
->
state
;
...
...
lib/libvgz/inftrees.c
View file @
fd78cc32
/* inftrees.c -- generate Huffman trees for efficient decoding
* Copyright (C) 1995-202
2
Mark Adler
* Copyright (C) 1995-202
3
Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
...
...
@@ -10,7 +10,7 @@
extern
const
char
inflate_copyright
[];
const
char
inflate_copyright
[]
=
" inflate 1.
2.13 Copyright 1995-2022
Mark Adler "
;
" inflate 1.
3 Copyright 1995-2023
Mark Adler "
;
/*
If you use the zlib library in a product, an acknowledgment is welcome
in the documentation of your product. If for some reason you cannot
...
...
@@ -30,15 +30,9 @@ const char inflate_copyright[] =
table index bits. It will differ if the request is greater than the
longest code or if it is less than the shortest code.
*/
int
ZLIB_INTERNAL
inflate_table
(
codetype
type
,
unsigned
short
FAR
*
lens
,
unsigned
codes
,
code
FAR
*
FAR
*
table
,
unsigned
FAR
*
bits
,
unsigned
short
FAR
*
work
)
{
int
ZLIB_INTERNAL
inflate_table
(
codetype
type
,
unsigned
short
FAR
*
lens
,
unsigned
codes
,
code
FAR
*
FAR
*
table
,
unsigned
FAR
*
bits
,
unsigned
short
FAR
*
work
)
{
unsigned
len
;
/* a code's length in bits */
unsigned
sym
;
/* index of code symbols */
unsigned
min
,
max
;
/* minimum and maximum code lengths */
...
...
@@ -64,7 +58,7 @@ int ZLIB_INTERNAL inflate_table(
35
,
43
,
51
,
59
,
67
,
83
,
99
,
115
,
131
,
163
,
195
,
227
,
258
,
0
,
0
};
static
const
unsigned
short
lext
[
31
]
=
{
/* Length codes 257..285 extra */
16
,
16
,
16
,
16
,
16
,
16
,
16
,
16
,
17
,
17
,
17
,
17
,
18
,
18
,
18
,
18
,
19
,
19
,
19
,
19
,
20
,
20
,
20
,
20
,
21
,
21
,
21
,
21
,
16
,
19
4
,
65
};
19
,
19
,
19
,
19
,
20
,
20
,
20
,
20
,
21
,
21
,
21
,
21
,
16
,
19
8
,
203
};
static
const
unsigned
short
dbase
[
32
]
=
{
/* Distance codes 0..29 base */
1
,
2
,
3
,
4
,
5
,
7
,
9
,
13
,
17
,
25
,
33
,
49
,
65
,
97
,
129
,
193
,
257
,
385
,
513
,
769
,
1025
,
1537
,
2049
,
3073
,
4097
,
6145
,
...
...
lib/libvgz/trees.c
View file @
fd78cc32
This diff is collapsed.
Click to expand it.
lib/libvgz/vgz.h
View file @
fd78cc32
/* zlib.h -- interface of the 'zlib' general purpose compression library
version 1.
2.13, October 13th, 2022
version 1.
3, August 18th, 2023
Copyright (C) 1995-202
2
Jean-loup Gailly and Mark Adler
Copyright (C) 1995-202
3
Jean-loup Gailly and Mark Adler
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
...
...
@@ -37,11 +37,11 @@
extern
"C"
{
#endif
#define ZLIB_VERSION "1.
2.1
3"
#define ZLIB_VERNUM 0x1
2d
0
#define ZLIB_VERSION "1.3"
#define ZLIB_VERNUM 0x1
30
0
#define ZLIB_VER_MAJOR 1
#define ZLIB_VER_MINOR
2
#define ZLIB_VER_REVISION
13
#define ZLIB_VER_MINOR
3
#define ZLIB_VER_REVISION
0
#define ZLIB_VER_SUBREVISION 0
/*
...
...
@@ -235,7 +235,7 @@ ZEXTERN int ZEXPORT deflateInit (z_streamp strm, int level);
Initializes the internal stream state for compression. The fields
zalloc, zfree and opaque must be initialized before by the caller. If
zalloc and zfree are set to Z_NULL, deflateInit updates them to use default
allocation functions.
allocation functions.
total_in, total_out, adler, and msg are initialized.
The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
1 gives best speed, 9 gives best compression, 0 gives no compression at all
...
...
@@ -325,8 +325,8 @@ ZEXTERN int ZEXPORT deflate (z_streamp strm, int flush);
with the same value of the flush parameter and more output space (updated
avail_out), until the flush is complete (deflate returns with non-zero
avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
avail_out is greater than six
to avoid repeated flush markers due to
avail_out == 0 on return
.
avail_out is greater than six
when the flush marker begins, in order to avoid
repeated flush markers upon calling deflate() again when avail_out == 0
.
If the parameter flush is set to Z_FINISH, pending input is processed,
pending output is flushed and deflate returns with Z_STREAM_END if there was
...
...
@@ -388,7 +388,8 @@ ZEXTERN int ZEXPORT inflateInit (z_streamp strm);
read or consumed. The allocation of a sliding window will be deferred to
the first call of inflate (if the decompression does not complete on the
first call). If zalloc and zfree are set to Z_NULL, inflateInit updates
them to use default allocation functions.
them to use default allocation functions. total_in, total_out, adler, and
msg are initialized.
inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
...
...
@@ -701,7 +702,7 @@ ZEXTERN int ZEXPORT deflateReset (z_streamp strm);
This function is equivalent to deflateEnd followed by deflateInit, but
does not free and reallocate the internal compression state. The stream
will leave the compression level and any other attributes that may have been
set unchanged.
set unchanged.
total_in, total_out, adler, and msg are initialized.
deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
stream state was inconsistent (such as zalloc or state being Z_NULL).
...
...
@@ -734,7 +735,7 @@ ZEXTERN int ZEXPORT deflateParams (z_streamp strm,
Then no more input data should be provided before the deflateParams() call.
If this is done, the old level and strategy will be applied to the data
compressed before deflateParams(), and the new level and strategy will be
applied to the
the
data compressed after deflateParams().
applied to the data compressed after deflateParams().
deflateParams returns Z_OK on success, Z_STREAM_ERROR if the source stream
state was inconsistent or if a parameter was invalid, or Z_BUF_ERROR if
...
...
@@ -826,8 +827,9 @@ ZEXTERN int ZEXPORT deflateSetHeader (z_streamp strm,
gzip file" and give up.
If deflateSetHeader is not used, the default gzip header has text false,
the time set to zero, and os set to 255, with no extra, name, or comment
fields. The gzip header is returned to the default state by deflateReset().
the time set to zero, and os set to the current operating system, with no
extra, name, or comment fields. The gzip header is returned to the default
state by deflateReset().
deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
stream state was inconsistent.
...
...
@@ -966,6 +968,7 @@ ZEXTERN int ZEXPORT inflateReset (z_streamp strm);
This function is equivalent to inflateEnd followed by inflateInit,
but does not free and reallocate the internal decompression state. The
stream will keep attributes that may have been set by inflateInit2.
total_in, total_out, adler, and msg are initialized.
inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
stream state was inconsistent (such as zalloc or state being Z_NULL).
...
...
@@ -1470,7 +1473,7 @@ ZEXTERN z_size_t ZEXPORT gzfwrite (voidpc buf, z_size_t size,
is returned, and the error state is set to Z_STREAM_ERROR.
*/
ZEXTERN
int
ZEXPORTVA
gzprintf
Z_ARG
((
gzFile
file
,
const
char
*
format
,
...)
);
ZEXTERN
int
ZEXPORTVA
gzprintf
(
gzFile
file
,
const
char
*
format
,
...
);
/*
Convert, format, compress, and write the arguments (...) to file under
control of the string format, as in fprintf. gzprintf returns the number of
...
...
@@ -1927,9 +1930,9 @@ ZEXTERN gzFile ZEXPORT gzopen_w (const wchar_t *path,
#endif
#if defined(STDC) || defined(Z_HAVE_STDARG_H)
# ifndef Z_SOLO
ZEXTERN
int
ZEXPORTVA
gzvprintf
Z_ARG
(
(
gzFile
file
,
ZEXTERN
int
ZEXPORTVA
gzvprintf
(
gzFile
file
,
const
char
*
format
,
va_list
va
)
)
;
va_list
va
);
# endif
#endif
...
...
lib/libvgz/zconf.h
View file @
fd78cc32
...
...
@@ -241,7 +241,11 @@
#endif
#ifdef Z_SOLO
typedef
unsigned
long
z_size_t
;
# ifdef _WIN64
typedef
unsigned
long
long
z_size_t
;
# else
typedef
unsigned
long
z_size_t
;
# endif
#else
# define z_longlong long long
# if defined(NO_SIZE_T)
...
...
@@ -520,7 +524,7 @@ typedef uLong FAR uLongf;
#if !defined(_WIN32) && defined(Z_LARGE64)
# define z_off64_t off64_t
#else
# if defined(_WIN32) && !defined(__GNUC__)
&& !defined(Z_SOLO)
# if defined(_WIN32) && !defined(__GNUC__)
# define z_off64_t __int64
# else
# define z_off64_t z_off_t
...
...
lib/libvgz/zutil.c
View file @
fd78cc32
...
...
@@ -25,13 +25,11 @@ z_const char * const z_errmsg[10] = {
#ifdef NOVGZ
const
char
*
ZEXPORT
zlibVersion
()
{
const
char
*
ZEXPORT
zlibVersion
(
void
)
{
return
ZLIB_VERSION
;
}
uLong
ZEXPORT
zlibCompileFlags
()
{
uLong
ZEXPORT
zlibCompileFlags
(
void
)
{
uLong
flags
;
flags
=
0
;
...
...
@@ -122,9 +120,7 @@ uLong ZEXPORT zlibCompileFlags()
# endif
int
ZLIB_INTERNAL
z_verbose
=
verbose
;
void
ZLIB_INTERNAL
z_error
(
m
)
char
*
m
;
{
void
ZLIB_INTERNAL
z_error
(
char
*
m
)
{
fprintf
(
stderr
,
"%s
\n
"
,
m
);
exit
(
1
);
}
...
...
@@ -133,9 +129,7 @@ void ZLIB_INTERNAL z_error (m)
/* exported to allow conversion of error code to string for compress() and
* uncompress()
*/
const
char
*
ZEXPORT
zError
(
err
)
int
err
;
{
const
char
*
ZEXPORT
zError
(
int
err
)
{
return
ERR_MSG
(
err
);
}
...
...
@@ -149,22 +143,14 @@ const char * ZEXPORT zError(err)
#ifndef HAVE_MEMCPY
void
ZLIB_INTERNAL
zmemcpy
(
dest
,
source
,
len
)
Bytef
*
dest
;
const
Bytef
*
source
;
uInt
len
;
{
void
ZLIB_INTERNAL
zmemcpy
(
Bytef
*
dest
,
const
Bytef
*
source
,
uInt
len
)
{
if
(
len
==
0
)
return
;
do
{
*
dest
++
=
*
source
++
;
/* ??? to be unrolled */
}
while
(
--
len
!=
0
);
}
int
ZLIB_INTERNAL
zmemcmp
(
s1
,
s2
,
len
)
const
Bytef
*
s1
;
const
Bytef
*
s2
;
uInt
len
;
{
int
ZLIB_INTERNAL
zmemcmp
(
const
Bytef
*
s1
,
const
Bytef
*
s2
,
uInt
len
)
{
uInt
j
;
for
(
j
=
0
;
j
<
len
;
j
++
)
{
...
...
@@ -173,10 +159,7 @@ int ZLIB_INTERNAL zmemcmp(s1, s2, len)
return
0
;
}
void
ZLIB_INTERNAL
zmemzero
(
dest
,
len
)
Bytef
*
dest
;
uInt
len
;
{
void
ZLIB_INTERNAL
zmemzero
(
Bytef
*
dest
,
uInt
len
)
{
if
(
len
==
0
)
return
;
do
{
*
dest
++
=
0
;
/* ??? to be unrolled */
...
...
@@ -219,8 +202,7 @@ local ptr_table table[MAX_PTR];
* a protected system like OS/2. Use Microsoft C instead.
*/
voidpf
ZLIB_INTERNAL
zcalloc
(
voidpf
opaque
,
unsigned
items
,
unsigned
size
)
{
voidpf
ZLIB_INTERNAL
zcalloc
(
voidpf
opaque
,
unsigned
items
,
unsigned
size
)
{
voidpf
buf
;
ulg
bsize
=
(
ulg
)
items
*
size
;
...
...
@@ -245,8 +227,7 @@ voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
return
buf
;
}
void
ZLIB_INTERNAL
zcfree
(
voidpf
opaque
,
voidpf
ptr
)
{
void
ZLIB_INTERNAL
zcfree
(
voidpf
opaque
,
voidpf
ptr
)
{
int
n
;
(
void
)
opaque
;
...
...
@@ -282,14 +263,12 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
# define _hfree hfree
#endif
voidpf
ZLIB_INTERNAL
zcalloc
(
voidpf
opaque
,
uInt
items
,
uInt
size
)
{
voidpf
ZLIB_INTERNAL
zcalloc
(
voidpf
opaque
,
uInt
items
,
uInt
size
)
{
(
void
)
opaque
;
return
_halloc
((
long
)
items
,
size
);
}
void
ZLIB_INTERNAL
zcfree
(
voidpf
opaque
,
voidpf
ptr
)
{
void
ZLIB_INTERNAL
zcfree
(
voidpf
opaque
,
voidpf
ptr
)
{
(
void
)
opaque
;
_hfree
(
ptr
);
}
...
...
@@ -307,22 +286,13 @@ extern voidp calloc (uInt items, uInt size);
extern
void
free
(
voidpf
ptr
);
#endif
voidpf
ZLIB_INTERNAL
zcalloc
(
voidpf
opaque
,
unsigned
items
,
unsigned
size
)
{
voidpf
ZLIB_INTERNAL
zcalloc
(
voidpf
opaque
,
unsigned
items
,
unsigned
size
)
{
(
void
)
opaque
;
return
sizeof
(
uInt
)
>
2
?
(
voidpf
)
malloc
(
items
*
size
)
:
(
voidpf
)
calloc
(
items
,
size
);
}
void
ZLIB_INTERNAL
zcfree
(
voidpf
opaque
,
voidpf
ptr
)
{
void
ZLIB_INTERNAL
zcfree
(
voidpf
opaque
,
voidpf
ptr
)
{
(
void
)
opaque
;
free
(
ptr
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment