diff options
author | unknown <jimw@mysql.com> | 2005-08-09 10:22:48 -0700 |
---|---|---|
committer | unknown <jimw@mysql.com> | 2005-08-09 10:22:48 -0700 |
commit | c0941e427888b43460c85e58ab91b423844bb679 (patch) | |
tree | 9b1ac253febefb83c1d2f4e1d369db3b53a16727 /zlib/infback.c | |
parent | a4217760b409a0ab05b32f748da70dce629e4697 (diff) | |
download | mariadb-git-c0941e427888b43460c85e58ab91b423844bb679.tar.gz |
Import zlib-1.2.3 library
zlib/ChangeLog:
Import zlib-1.2.3
zlib/FAQ:
Import zlib-1.2.3
zlib/README:
Import zlib-1.2.3
zlib/adler32.c:
Import zlib-1.2.3
zlib/compress.c:
Import zlib-1.2.3
zlib/crc32.c:
Import zlib-1.2.3
zlib/deflate.c:
Import zlib-1.2.3
zlib/deflate.h:
Import zlib-1.2.3
zlib/gzio.c:
Import zlib-1.2.3
zlib/infback.c:
Import zlib-1.2.3
zlib/inffast.c:
Import zlib-1.2.3
zlib/inflate.c:
Import zlib-1.2.3
zlib/inflate.h:
Import zlib-1.2.3
zlib/inftrees.c:
Import zlib-1.2.3
zlib/inftrees.h:
Import zlib-1.2.3
zlib/trees.c:
Import zlib-1.2.3
zlib/zconf.h:
Import zlib-1.2.3
zlib/zlib.3:
Import zlib-1.2.3
zlib/zlib.h:
Import zlib-1.2.3
zlib/zutil.c:
Import zlib-1.2.3
zlib/zutil.h:
Import zlib-1.2.3
zlib/README.MySQL:
Import zlib-1.2.3
Diffstat (limited to 'zlib/infback.c')
-rw-r--r-- | zlib/infback.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/zlib/infback.c b/zlib/infback.c index 262f97c73ac..455dbc9ee84 100644 --- a/zlib/infback.c +++ b/zlib/infback.c @@ -1,5 +1,5 @@ /* infback.c -- inflate using a call-back interface - * Copyright (C) 1995-2003 Mark Adler + * Copyright (C) 1995-2005 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -26,7 +26,7 @@ local void fixedtables OF((struct inflate_state FAR *state)); window and output buffer that is 2**windowBits bytes. */ int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size) -z_stream FAR *strm; +z_streamp strm; int windowBits; unsigned char FAR *window; const char *version; @@ -50,7 +50,8 @@ int stream_size; sizeof(struct inflate_state)); if (state == Z_NULL) return Z_MEM_ERROR; Tracev((stderr, "inflate: allocated\n")); - strm->state = (voidpf)state; + strm->state = (struct internal_state FAR *)state; + state->dmax = 32768U; state->wbits = windowBits; state->wsize = 1U << windowBits; state->window = window; @@ -238,7 +239,7 @@ struct inflate_state FAR *state; 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_stream FAR *strm; +z_streamp strm; in_func in; void FAR *in_desc; out_func out; @@ -611,7 +612,7 @@ void FAR *out_desc; } int ZEXPORT inflateBackEnd(strm) -z_stream FAR *strm; +z_streamp strm; { if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) return Z_STREAM_ERROR; |