Update examples/gun.c for proper z_const usage.

This commit is contained in:
Mark Adler 2012-08-13 21:49:10 -07:00
parent 62d6112a79
commit 360c3e9532

View File

@ -1,7 +1,7 @@
/* gun.c -- simple gunzip to give an example of the use of inflateBack() /* gun.c -- simple gunzip to give an example of the use of inflateBack()
* Copyright (C) 2003, 2005, 2008, 2010 Mark Adler * Copyright (C) 2003, 2005, 2008, 2010, 2012 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h * For conditions of distribution and use, see copyright notice in zlib.h
Version 1.6 17 January 2010 Mark Adler */ Version 1.7 12 August 2012 Mark Adler */
/* Version history: /* Version history:
1.0 16 Feb 2003 First version for testing of inflateBack() 1.0 16 Feb 2003 First version for testing of inflateBack()
@ -18,6 +18,7 @@
1.4 8 Dec 2006 LZW decompression speed improvements 1.4 8 Dec 2006 LZW decompression speed improvements
1.5 9 Feb 2008 Avoid warning in latest version of gcc 1.5 9 Feb 2008 Avoid warning in latest version of gcc
1.6 17 Jan 2010 Avoid signed/unsigned comparison warnings 1.6 17 Jan 2010 Avoid signed/unsigned comparison warnings
1.7 12 Aug 2012 Update for z_const usage in zlib 1.2.8
*/ */
/* /*
@ -85,7 +86,7 @@ struct ind {
/* Load input buffer, assumed to be empty, and return bytes loaded and a /* Load input buffer, assumed to be empty, and return bytes loaded and a
pointer to them. read() is called until the buffer is full, or until it pointer to them. read() is called until the buffer is full, or until it
returns end-of-file or error. Return 0 on error. */ returns end-of-file or error. Return 0 on error. */
local unsigned in(void *in_desc, unsigned char **buf) local unsigned in(void *in_desc, z_const unsigned char **buf)
{ {
int ret; int ret;
unsigned len; unsigned len;
@ -196,7 +197,7 @@ unsigned char match[65280 + 2]; /* buffer for reversed match or gzip
file, read error, or write error (a write error indicated by strm->next_in file, read error, or write error (a write error indicated by strm->next_in
not equal to Z_NULL), or Z_DATA_ERROR for invalid input. not equal to Z_NULL), or Z_DATA_ERROR for invalid input.
*/ */
local int lunpipe(unsigned have, unsigned char *next, struct ind *indp, local int lunpipe(unsigned have, z_const unsigned char *next, struct ind *indp,
int outfile, z_stream *strm) int outfile, z_stream *strm)
{ {
int last; /* last byte read by NEXT(), or -1 if EOF */ int last; /* last byte read by NEXT(), or -1 if EOF */
@ -383,7 +384,7 @@ local int gunpipe(z_stream *strm, int infile, int outfile)
{ {
int ret, first, last; int ret, first, last;
unsigned have, flags, len; unsigned have, flags, len;
unsigned char *next = NULL; z_const unsigned char *next = NULL;
struct ind ind, *indp; struct ind ind, *indp;
struct outd outd; struct outd outd;