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/infback.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/infback.c')
-rw-r--r-- | src/Common/zlib/infback.c | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/src/Common/zlib/infback.c b/src/Common/zlib/infback.c index babeaf18..e7b25b30 100644 --- a/src/Common/zlib/infback.c +++ b/src/Common/zlib/infback.c @@ -15,9 +15,6 @@ #include "inflate.h" #include "inffast.h" -/* function prototypes */ -local void fixedtables OF((struct inflate_state FAR *state)); - /* strm provides memory allocation functions in zalloc and zfree, or Z_NULL to use the library memory allocation functions. @@ -25,13 +22,9 @@ local void fixedtables OF((struct inflate_state FAR *state)); windowBits is in the range 8..15, and window is a user-supplied window and output buffer that is 2**windowBits bytes. */ -int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size) -z_streamp strm; -int windowBits; -unsigned char FAR *window; -const char *version; -int stream_size; -{ +int ZEXPORT inflateBackInit_(z_streamp strm, int windowBits, + unsigned char FAR *window, const char *version, + int stream_size) { struct inflate_state FAR *state; if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || @@ -80,9 +73,7 @@ int stream_size; used for threaded applications, since the rewriting of the tables and virgin may not be thread-safe. */ -local void fixedtables(state) -struct inflate_state FAR *state; -{ +local void fixedtables(struct inflate_state FAR *state) { #ifdef BUILDFIXED static int virgin = 1; static code *lenfix, *distfix; @@ -248,13 +239,8 @@ struct inflate_state FAR *state; inflateBack() can also return Z_STREAM_ERROR if the input parameters are not correct, i.e. strm is Z_NULL or the state was not initialized. */ -int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc) -z_streamp strm; -in_func in; -void FAR *in_desc; -out_func out; -void FAR *out_desc; -{ +int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc, + out_func out, void FAR *out_desc) { struct inflate_state FAR *state; z_const unsigned char FAR *next; /* next input */ unsigned char FAR *put; /* next output */ @@ -632,9 +618,7 @@ void FAR *out_desc; return ret; } -int ZEXPORT inflateBackEnd(strm) -z_streamp strm; -{ +int ZEXPORT inflateBackEnd(z_streamp strm) { if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) return Z_STREAM_ERROR; ZFREE(strm, strm->state); |