zlib 0.94

ChangeLog

@@ -1,5 +1,22 @@
+
 		ChangeLog file for zlib
 
+Changes in 0.94 (13 Aug 95)
+- support MSDOS medium model
+- fix deflate with flush (could sometimes generate bad output)
+- fix deflateReset (zlib header was incorrectly suppressed)
+- added support for VMS
+- allow a compression level in gzopen()
+- gzflush now calls fflush
+- For deflate with flush, flush even if no more input is provided.
+- rename libgz.a as libz.a
+- work around a problem with gcc on Alpha (in INSERT_STRING)
+- don't use inline functions (problem with some gcc versions)
+- allow renaming of Byte, uInt, etc... with #define.
+- avoid warning about (unused) pointer before start of array in deflate.c
+- avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c
+- avoid reserved word 'new' in trees.c
+
 Changes in 0.93 (25 June 95)
 - temporarily disable inline functions
 - make deflate deterministic

Make_vms.com

@@ -0,0 +1,115 @@
+$! make libz under VMS
+$! written by Martin P.J. Zinser <m.zinser@gsi.de>
+$!
+$! Look for the compiler used
+$!
+$ ccopt = ""
+$ if f$trnlnm("HW_MODEL").ge.1024
+$ then
+$  ccopt = "/prefix=all"+ccopt
+$  comp  = "__decc__=1"
+$  if f$trnlnm("SYS").eqs."" then define sys sys$library:
+$ else
+$  if f$search("SYS$SYSTEM:DECC$COMPILER.EXE").eqs.""
+$   then
+$    comp  = "__vaxc__=1"
+$    if f$trnlnm("SYS").eqs."" then define sys sys$library:
+$   else
+$    if f$trnlnm("SYS").eqs."" then define sys decc$library_include:
+$    ccopt = "/decc/prefix=all"+ccopt
+$    comp  = "__decc__=1"
+$  endif
+$ endif
+$!
+$! Build the thing plain or with mms
+$!
+$ write sys$output "Compiling Zlib sources ..."
+$ if f$search("SYS$SYSTEM:MMS.EXE").eqs.""
+$  then
+$   dele example.obj;*,minigzip.obj;*
+$   CALL MAKE adler32.OBJ "CC ''CCOPT' adler32" -
+                adler32.c zutil.h zlib.h zconf.h
+$   CALL MAKE compress.OBJ "CC ''CCOPT' compress" -
+                compress.c zlib.h zconf.h
+$   CALL MAKE crc32.OBJ "CC ''CCOPT' crc32" -
+                crc32.c zutil.h zlib.h zconf.h
+$   CALL MAKE deflate.OBJ "CC ''CCOPT' deflate" -
+                deflatec.c deflate.h zutil.h zlib.h zconf.h
+$   CALL MAKE gzio.OBJ "CC ''CCOPT' gzio" -
+                gsio.c zutil.h zlib.h zconf.h
+$   CALL MAKE infblock.OBJ "CC ''CCOPT' infblock" -
+                infblock.c zutil.h zlib.h zconf.h infblock.h
+$   CALL MAKE infcodes.OBJ "CC ''CCOPT' infcodes" -
+                infcodes.c zutil.h zlib.h zconf.h inftrees.h
+$   CALL MAKE inffast.OBJ "CC ''CCOPT' inffast" -
+                inffast.c zutil.h zlib.h zconf.h inffast.h
+$   CALL MAKE inflate.OBJ "CC ''CCOPT' inflate" -
+                inflate.c zutil.h zlib.h zconf.h infblock.h
+$   CALL MAKE inftrees.OBJ "CC ''CCOPT' inftrees" -
+                inftrees.c zutil.h zlib.h zconf.h inftrees.h
+$   CALL MAKE infutil.OBJ "CC ''CCOPT' infutil" -
+                infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h
+$   CALL MAKE trees.OBJ "CC ''CCOPT' trees" -
+                trees.c deflate.h zutil.h zlib.h zconf.h
+$   CALL MAKE uncompr.OBJ "CC ''CCOPT' uncompr" -
+                uncompr.c zlib.h zconf.h
+$   CALL MAKE zutil.OBJ "CC ''CCOPT' zutil" -
+                zutil.c zutil.h zlib.h zconf.h
+$   write sys$output "Building Zlib ..."
+$   CALL MAKE libz.OLB "lib/crea libz.olb *.obj" *.OBJ
+$   write sys$output "Building example..."
+$   CALL MAKE example.OBJ "CC ''CCOPT' example" -
+                example.c zlib.h zconf.h
+$   call make example.exe "LINK example,libz.olb/lib" example.obj libz.olb
+$   write sys$output "Building minigzip..."
+$   CALL MAKE minigzip.OBJ "CC ''CCOPT' minigzip" -
+                minigzip.c zlib.h zconf.h
+$   call make minigzip.exe - 
+                "LINK minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib" - 
+                minigzip.obj libz.olb
+$  else
+$   mms/macro=('comp')
+$  endif
+$ write sys$output "Zlib build completed"
+$ exit
+$!
+$!
+$MAKE: SUBROUTINE   !SUBROUTINE TO CHECK DEPENDENCIES
+$ V = 'F$Verify(0)
+$! P1 = What we are trying to make
+$! P2 = Command to make it
+$! P3 - P8  What it depends on
+$
+$ If F$Search(P1) .Eqs. "" Then Goto Makeit
+$ Time = F$CvTime(F$File(P1,"RDT"))
+$arg=3
+$Loop:
+$       Argument = P'arg
+$       If Argument .Eqs. "" Then Goto Exit
+$       El=0
+$Loop2:
+$       File = F$Element(El," ",Argument)
+$       If File .Eqs. " " Then Goto Endl
+$       AFile = ""
+$Loop3:
+$       OFile = AFile
+$       AFile = F$Search(File)
+$       If AFile .Eqs. "" .Or. AFile .Eqs. OFile Then Goto NextEl
+$       If F$CvTime(F$File(AFile,"RDT")) .Ges. Time Then Goto Makeit
+$       Goto Loop3
+$NextEL:
+$       El = El + 1
+$       Goto Loop2
+$EndL:
+$ arg=arg+1
+$ If arg .Le. 8 Then Goto Loop
+$ Goto Exit
+$
+$Makeit:
+$ VV=F$VERIFY(0)
+$ write sys$output P2
+$ 'P2
+$ VV='F$Verify(VV)
+$Exit:
+$ If V Then Set Verify
+$ENDSUBROUTINE

Makefile

@@ -7,7 +7,7 @@ CFLAGS=-O
 #use -O3 for gcc to take advantage of inlining
 #CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
 #CFLAGS=-g -DDEBUG
-LDFLAGS=-L. -lgz
+LDFLAGS=-L. -lz
 
 RANLIB=ranlib
 
@@ -24,33 +24,34 @@ test: all
 	./example
 	echo hello world | ./minigzip | ./minigzip -d 
 
-install: libgz.a
+install: libz.a
 	-@mkdir $(prefix)/include
 	-@mkdir $(prefix)/lib
 	cp zlib.h zconf.h $(prefix)/include
 	chmod 644 $(prefix)/include/zlib.h $(prefix)/include/zconf.h
-	cp libgz.a $(prefix)/lib
+	cp libz.a $(prefix)/lib
-	chmod 644 $(prefix)/lib/libgz.a
+	chmod 644 $(prefix)/lib/libz.a
 
-libgz.a: $(OBJS)
+libz.a: $(OBJS)
 	ar rc $@ $(OBJS)
 	$(RANLIB) $@
 
-example: example.o libgz.a
+example: example.o libz.a
 	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
 
-minigzip: minigzip.o libgz.a
+minigzip: minigzip.o libz.a
 	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
 
 clean:
-	rm -f *.o example minigzip libgz.a foo.gz
+	rm -f *.o example minigzip libz.a foo.gz
 
 zip:
-	zip -ul9 zlib README ChangeLog Makefile Makefile.??? Makefile.?? *.[ch]
+	zip -ul9 zlib README ChangeLog Makefile Make????.??? Makefile.?? \
+	  descrip.mms *.[ch]
 
 tgz:
 	cd ..; tar cfz zlib/zlib.tgz zlib/README zlib/ChangeLog zlib/Makefile \
-		zlib/Makefile.??? zlib/Makefile.?? zlib/*.[ch]
+	  zlib/Make????.??? zlib/Makefile.?? zlib/descrip.mms zlib/*.[ch]
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 

Makefile.bor

@@ -4,9 +4,11 @@
 # To use, do "make -fmakefile.bor"
 
 # WARNING: the small model is supported but only for small values of
-# MAX_WBITS and MAX_MEM_LEVEL. If you wish to reduce the memory
+# MAX_WBITS and MAX_MEM_LEVEL. For example:
-# requirements (default 256K for big objects plus a few K), you can add
+#    -DMAX_WBITS=11 -DDEF_WBITS=11 -DMAX_MEM_LEVEL=3
-# to CFLAGS below: -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
+# If you wish to reduce the memory requirements (default 256K for big
+# objects plus a few K), you can add to CFLAGS below: 
+#   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
 # See zconf.h for details about the memory requirements.
 
 # ------------- Turbo C++, Borland C++ -------------
@@ -83,6 +85,7 @@ minigzip.obj: minigzip.c zlib.h zconf.h
 
 # we must cut the command line to fit in the MS/DOS 128 byte limit:
 zlib.lib: $(OBJ1) $(OBJ2)
+	del zlib.lib
 	$(LIB) zlib +$(OBJP1)
 	$(LIB) zlib +$(OBJP2)
 

Makefile.msc

@@ -3,10 +3,9 @@
 
 # To use, do "make makefile.msc"
 
-# WARNING: the small model is supported but only for small values of
+# If you wish to reduce the memory requirements (default 256K for big
-# MAX_WBITS and MAX_MEM_LEVEL. If you wish to reduce the memory
+# objects plus a few K), you can add to CFLAGS below: 
-# requirements (default 256K for big objects plus a few K), you can add
+#   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
-# to CFLAGS below: -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
 # See zconf.h for details about the memory requirements.
 
 # ------------- Microsoft C 5.1 and later -------------
@@ -80,6 +79,7 @@ minigzip.obj: minigzip.c zlib.h zconf.h
 
 # we must cut the command line to fit in the MS/DOS 128 byte limit:
 zlib.lib: $(OBJ1) $(OBJ2)
+        del zlib.lib
 	lib zlib $(OBJ1);
 	lib zlib $(OBJ2);
 

Makefile.qnx

@@ -0,0 +1,75 @@
+# Makefile for zlib
+# Copyright (C) 1995 Jean-loup Gailly.
+# For conditions of distribution and use, see copyright notice in zlib.h 
+
+# Modified slightly for QNX by Chris Herborth (chrish@qnx.com)
+
+CC=cc
+CFLAGS=-4 -O -Q
+#use -O3 for gcc to take advantage of inlining
+#CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+#CFLAGS=-g -DDEBUG
+LDFLAGS=-L. -lz
+
+#RANLIB=ranlib
+
+prefix=/usr/local
+
+OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
+       zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o
+
+TEST_OBJS = example.o minigzip.o
+
+all: example minigzip
+
+test: all
+	./example
+	echo hello world | ./minigzip | ./minigzip -d 
+
+install: zlib.lib
+	-@mkdir $(prefix)/include
+	-@mkdir $(prefix)/lib
+	cp zlib.h zconf.h $(prefix)/include
+	chmod 644 $(prefix)/include/zlib.h $(prefix)/include/zconf.h
+	cp zlib.lib $(prefix)/lib
+	chmod 644 $(prefix)/lib/zlib.lib
+
+zlib.lib: $(OBJS)
+	cc -A $@ $(OBJS)
+#	ar rc $@ $(OBJS)
+#	$(RANLIB) $@
+
+example: example.o zlib.lib
+	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
+
+minigzip: minigzip.o zlib.lib
+	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
+
+clean:
+	rm -f *.o example minigzip zlib.lib foo.gz
+
+zip:
+	zip -ul9 zlib README ChangeLog Makefile Makefile.??? Makefile.?? *.[ch]
+
+tgz:
+	cd ..; tar cfz zlib/zlib.tgz zlib/README zlib/ChangeLog zlib/Makefile \
+		zlib/Makefile.??? zlib/Makefile.?? zlib/*.[ch]
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+adler32.o: zutil.h zlib.h zconf.h
+compress.o: zlib.h zconf.h
+crc32.o: zutil.h zlib.h zconf.h
+deflate.o: deflate.h zutil.h zlib.h zconf.h
+example.o: zlib.h zconf.h
+gzio.o: zutil.h zlib.h zconf.h
+infblock.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
+infcodes.o: zutil.h zlib.h zconf.h inftrees.h infutil.h infcodes.h inffast.h
+inffast.o: zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
+inflate.o: zutil.h zlib.h zconf.h infblock.h
+inftrees.o: zutil.h zlib.h zconf.h inftrees.h
+infutil.o: zutil.h zlib.h zconf.h inftrees.h infutil.h
+minigzip.o: zlib.h zconf.h
+trees.o: deflate.h zutil.h zlib.h zconf.h
+uncompr.o: zlib.h zconf.h
+zutil.o: zutil.h zlib.h zconf.h

Makefile.tc

@@ -4,18 +4,20 @@
 # To use, do "make -fmakefile.tc"
 
 # WARNING: the small model is supported but only for small values of
-# MAX_WBITS and MAX_MEM_LEVEL. If you wish to reduce the memory
+# MAX_WBITS and MAX_MEM_LEVEL. For example:
-# requirements (default 256K for big objects plus a few K), you can add
+#    -DMAX_WBITS=11 -DDEF_WBITS=11 -DMAX_MEM_LEVEL=3
-# to CFLAGS below: -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
+# If you wish to reduce the memory requirements (default 256K for big
+# objects plus a few K), you can add to CFLAGS below: 
+#   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
 # See zconf.h for details about the memory requirements.
 
 # ------------- Turbo C 2.0 -------------
 MODEL=-ml
-CFLAGS=-O2 -Z $(MODEL)
+CFLAGS=-O2 -G -Z $(MODEL)
-CC=tcc
+CC=tcc -I\tc\include
-LD=tcc
+LD=tcc -L\tc\lib
 LIB=tlib
-LDFLAGS=$(MODEL)
+LDFLAGS=$(MODEL) -f-
 O=.obj
 
 # variables
@@ -82,6 +84,7 @@ minigzip.obj: minigzip.c zlib.h zconf.h
 
 # we must cut the command line to fit in the MS/DOS 128 byte limit:
 zlib.lib: $(OBJ1) $(OBJ2)
+	del zlib.lib
 	$(LIB) zlib +$(OBJP1)
 	$(LIB) zlib +$(OBJP2)
 

README

@@ -1,4 +1,6 @@
-zlib 0.93 is a beta version of a general purpose compression library.
+zlib 0.94 is a beta version of a general purpose compression library.
+Unless new bugs are found it will be released again as the first official
+version (1.0). This version has no known bugs.
 
 The data format used by the zlib library is described in the
 files zlib-3.1.doc, deflate-1.1.doc and gzip-4.1.doc, available
@@ -10,31 +12,30 @@ which also tests that the library is working correctly.
 
 To compile all files and run the test program, just type: make test
 (For MSDOS, use one of the special makefiles such as Makefile.msc.)
-To install the zlib library (libgz.a) in /usr/local/lib, type: make install
+To install the zlib library (libz.a) in /usr/local/lib, type: make install
-To install in a different directory, use for example: make install prefix=$HOME
+To install in a different directory, use for example:
+  make install prefix=$HOME
 This will install in $HOME/lib instead of /usr/local/lib.
 
-The changes made in version 0.93 are documented in the file ChangeLog.
+The changes made in version 0.94 are documented in the file ChangeLog.
-The main changes since 0.9 are:
+The main changes since 0.93 are:
-- temporarily disable inline functions
+- support MSDOS small and medium model
-- make deflate deterministic
+- fix deflate with flush (could sometimes generate bad output)
-- don't use signed char in inflate (not portable enough)
+- fix deflateReset (zlib header was incorrectly suppressed)
-- fix inflate memory leak for segmented architectures
+- added support for VMS
-- Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h
+- allow a compression level in gzopen()
-- Document the memory requirements in zconf.h
+- gzflush now calls fflush
-- added "make install"
+- For deflate with flush, flush even if no more input is provided.
-- added support for DJGPP and Pyramid
+- rename libgz.a as libz.a
-- fix an inflate bug for stored blocks.
-- various speedups
 
-On MSDOS, this version works in both large and small model. However
+For MSDOS, the small and medium models are supported only for Microsoft C.
-small model compression works only for small values of MAX_MEM_LEVEL
+(It should be easy to support them for Borland C also, but I don't have
-and MAX_WBITS (see zconf.h). Small model decompression should work up
+a recent Borland compiler to test with.) The small model currently works
-to MAX_WBITS=15.  This version of zlib does not support small or
+for Turbo/Borland C but only with reduced performance to avoid any far
-medium model with far allocation of big objects.
+allocation (tested with -DMAX_WBITS=11 -DDEF_WBITS=11 -DMAX_MEM_LEVEL=3).
 
 
-  Copyright (C) 1995 Jean-loup Gailly and Mark Adler
+ (C) 1995 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

adler32.c

@@ -5,9 +5,9 @@
 
 /* $Id: adler32.c,v 1.6 1995/05/03 17:27:08 jloup Exp $ */
 
-#include "zutil.h"
+#include "zlib.h"
 
-#define BASE 65521 /* largest prime smaller than 65536 */
+#define BASE 65521L /* largest prime smaller than 65536 */
 #define NMAX 5552
 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
 
@@ -20,7 +20,7 @@
 /* ========================================================================= */
 uLong adler32(adler, buf, len)
     uLong adler;
-    Byte *buf;
+    Bytef *buf;
     uInt len;
 {
     unsigned long s1 = adler & 0xffff;

compress.c

@@ -20,9 +20,9 @@
    buffer.
 */
 int compress (dest, destLen, source, sourceLen)
-    Byte *dest;
+    Bytef *dest;
-    uLong *destLen;
+    uLongf *destLen;
-    Byte *source;
+    Bytef *source;
     uLong sourceLen;
 {
     z_stream stream;

crc32.c

@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* $Id: crc32.c,v 1.5 1995/05/01 13:55:46 jloup Exp $ */
+/* $Id: crc32.c,v 1.4 1995/04/14 14:55:12 jloup Exp $ */
 
 #include "zlib.h"
 
@@ -99,7 +99,7 @@ local uLong crc_table[] = {
 /* ========================================================================= */
 uLong crc32(crc, buf, len)
     uLong crc;
-    Byte *buf;
+    Bytef *buf;
     uInt len;
 {
     if (buf == Z_NULL) return 0L;

deflate.c

@@ -113,21 +113,21 @@ struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
  *  Prototypes for local functions.
  */
 
-local void fill_window   __P((deflate_state *s));
+local void fill_window   OF((deflate_state *s));
-local int  deflate_fast  __P((deflate_state *s, int flush));
+local int  deflate_fast  OF((deflate_state *s, int flush));
-local int  deflate_slow  __P((deflate_state *s, int flush));
+local int  deflate_slow  OF((deflate_state *s, int flush));
-local void lm_init       __P((deflate_state *s));
+local void lm_init       OF((deflate_state *s));
-local inline int longest_match __P((deflate_state *s, IPos cur_match));
+local int longest_match  OF((deflate_state *s, IPos cur_match));
-local void putShortMSB   __P((deflate_state *s, uInt b));
+local void putShortMSB   OF((deflate_state *s, uInt b));
-local void flush_pending __P((z_stream *strm));
+local void flush_pending OF((z_stream *strm));
-local int read_buf       __P((z_stream *strm, char *buf, unsigned size));
+local int read_buf       OF((z_stream *strm, charf *buf, unsigned size));
 #ifdef ASMV
-      void match_init __P((void)); /* asm code initialization */
+      void match_init OF((void)); /* asm code initialization */
 #endif
 
 #ifdef DEBUG
-local  void check_match __P((deflate_state *s, IPos start, IPos match,
+local  void check_match OF((deflate_state *s, IPos start, IPos match,
-                             int length));
+                            int length));
 #endif
 
 
@@ -139,6 +139,7 @@ local  void check_match __P((deflate_state *s, IPos start, IPos match,
  */
 #define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
 
+
 /* ===========================================================================
  * Insert string str in the dictionary and set match_head to the previous head
  * of the hash chain (the most recent string with same hash key). Return
@@ -148,7 +149,7 @@ local  void check_match __P((deflate_state *s, IPos start, IPos match,
  *    (except for the last MIN_MATCH-1 bytes of the input file).
  */
 #define INSERT_STRING(s, str, match_head) \
-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + MIN_MATCH-1]), \
+   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
     s->prev[(str) & s->w_mask] = match_head = s->head[s->ins_h], \
     s->head[s->ins_h] = (str))
 
@@ -158,7 +159,7 @@ local  void check_match __P((deflate_state *s, IPos start, IPos match,
  */
 #define CLEAR_HASH(s) \
     s->head[s->hash_size-1] = NIL; \
-    zmemzero((char*)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
+    zmemzero((charf *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
 
 /* ========================================================================= */
 int deflateInit (strm, level)
@@ -199,7 +200,7 @@ int deflateInit2 (strm, level, method, windowBits, memLevel, strategy)
     }
     s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
     if (s == Z_NULL) return Z_MEM_ERROR;
-    strm->state = (struct internal_state *)s;
+    strm->state = (struct internal_state FAR *)s;
     s->strm = strm;
 
     s->noheader = noheader;
@@ -212,13 +213,13 @@ int deflateInit2 (strm, level, method, windowBits, memLevel, strategy)
     s->hash_mask = s->hash_size - 1;
     s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
 
-    s->window = (Byte*) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
+    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
-    s->prev   = (Pos*)  ZALLOC(strm, s->w_size, sizeof(Pos));
+    s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
-    s->head   = (Pos*)  ZALLOC(strm, s->hash_size, sizeof(Pos));
+    s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
 
     s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
 
-    s->pending_buf = (uch*) ZALLOC(strm, s->lit_bufsize, 2*sizeof(ush));
+    s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 2*sizeof(ush));
 
     if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
         s->pending_buf == Z_NULL) {
@@ -226,8 +227,8 @@ int deflateInit2 (strm, level, method, windowBits, memLevel, strategy)
         deflateEnd (strm);
         return Z_MEM_ERROR;
     }
-    s->d_buf = (ush*) &(s->pending_buf[s->lit_bufsize]);
+    s->d_buf = (ushf *) &(s->pending_buf[s->lit_bufsize]);
-    s->l_buf = (uch*) &(s->pending_buf[3*s->lit_bufsize]);
+    s->l_buf = (uchf *) &(s->pending_buf[3*s->lit_bufsize]);
     /* We overlay pending_buf and d_buf+l_buf. This works since the average
      * output size for (length,distance) codes is <= 32 bits (worst case
      * is 15+15+13=33).
@@ -257,6 +258,9 @@ int deflateReset (strm)
     s->pending = 0;
     s->pending_out = s->pending_buf;
 
+    if (s->noheader < 0) {
+        s->noheader = 0; /* was set to -1 by deflate(..., Z_FINISH); */
+    }
     s->status = s->noheader ? BUSY_STATE : INIT_STATE;
     s->adler = 1;
 
@@ -267,9 +271,9 @@ int deflateReset (strm)
 }
 
 /* =========================================================================
- * Put a short the pending_out buffer. The 16-bit value is put in MSB order.
+ * Put a short in the pending buffer. The 16-bit value is put in MSB order.
  * IN assertion: the stream state is correct and there is enough room in
- * the pending_out buffer.
+ * pending_buf.
  */
 local void putShortMSB (s, b)
     deflate_state *s;
@@ -308,7 +312,8 @@ int deflate (strm, flush)
 {
     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
     
-    if (strm->next_out == Z_NULL || strm->next_in == Z_NULL) {
+    if (strm->next_out == Z_NULL ||
+        (strm->next_in == Z_NULL && strm->avail_in != 0)) {
         ERR_RETURN(strm, Z_STREAM_ERROR);
     }
     if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
@@ -342,10 +347,10 @@ int deflate (strm, flush)
 
     /* Start a new block or continue the current one.
      */
-    if (strm->avail_in != 0 ||
+    if (strm->avail_in != 0 || strm->state->lookahead != 0 ||
-        (flush == Z_FINISH && strm->state->status != FINISH_STATE)) {
+        (flush != Z_NO_FLUSH && strm->state->status != FINISH_STATE)) {
         int quit;
-        
+
         if (flush == Z_FINISH) {
             strm->state->status = FINISH_STATE;
         }
@@ -354,17 +359,29 @@ int deflate (strm, flush)
         } else {
             quit = deflate_slow(strm->state, flush);
         }
-        if (flush == Z_FULL_FLUSH || flush == Z_SYNC_FLUSH) {
-            ct_stored_block(strm->state, (char*)0, 0L, 0); /* special marker */
-            flush_pending(strm);
-	    if (flush == Z_FULL_FLUSH) {
-		CLEAR_HASH(strm->state);             /* forget history */
-	    }
-        } else if (flush == Z_PARTIAL_FLUSH) {
-            ct_align(strm->state);
-            flush_pending(strm);
-        }
         if (quit || strm->avail_out == 0) return Z_OK;
+        /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
+         * of deflate should use the same flush parameter to make sure
+         * that the flush is complete. So we don't have to output an
+         * empty block here, this will be done at next call. This also
+         * ensures that for a very small output buffer, we emit at most
+         * one empty block.
+         */
+        if (flush != Z_OK && flush != Z_FINISH) {
+            if (flush == Z_PARTIAL_FLUSH) {
+                ct_align(strm->state);
+            } else { /* FULL_FLUSH or SYNC_FLUSH */
+                ct_stored_block(strm->state, (char*)0, 0L, 0);
+                /* For a full flush, this empty block will be recognized
+                 * as a special marker by inflate_sync().
+                 */
+                if (flush == Z_FULL_FLUSH) {
+                    CLEAR_HASH(strm->state);             /* forget history */
+                }
+            }
+            flush_pending(strm);
+            if (strm->avail_out == 0) return Z_OK;
+        }
     }
     Assert(strm->avail_out > 0, "bug2");
 
@@ -378,7 +395,7 @@ int deflate (strm, flush)
     /* If avail_out is zero, the application will call deflate again
      * to flush the rest.
      */
-    strm->state->noheader = 1; /* write the trailer only once! */
+    strm->state->noheader = -1; /* write the trailer only once! */
     return strm->state->pending != 0 ? Z_OK : Z_STREAM_END;
 }
 
@@ -410,7 +427,7 @@ int deflateCopy (dest, source)
     *dest = *source;
     return Z_STREAM_ERROR; /* to be implemented */
 #if 0
-    dest->state = (struct internal_state *)
+    dest->state = (struct internal_state FAR *)
         (*dest->zalloc)(1, sizeof(deflate_state));
     if (dest->state == Z_NULL) return Z_MEM_ERROR;
 
@@ -425,7 +442,7 @@ int deflateCopy (dest, source)
  */
 local int read_buf(strm, buf, size)
     z_stream *strm;
-    char *buf;
+    charf *buf;
     unsigned size;
 {
     unsigned len = strm->avail_in;
@@ -485,13 +502,13 @@ local void lm_init (s)
 /* For 80x86 and 680x0, an optimized version will be provided in match.asm or
  * match.S. The code will be functionally equivalent.
  */
-local inline int longest_match(s, cur_match)
+local int longest_match(s, cur_match)
     deflate_state *s;
     IPos cur_match;                             /* current match */
 {
     unsigned chain_length = s->max_chain_length;/* max hash chain length */
-    register Byte *scan = s->window + s->strstart; /* current string */
+    register Bytef *scan = s->window + s->strstart; /* current string */
-    register Byte *match;                       /* matched string */
+    register Bytef *match;                       /* matched string */
     register int len;                           /* length of current match */
     int best_len = s->prev_length;              /* best match length so far */
     IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
@@ -499,18 +516,18 @@ local inline int longest_match(s, cur_match)
     /* Stop when cur_match becomes <= limit. To simplify the code,
      * we prevent matches with the string of window index 0.
      */
-    Pos *prev = s->prev;
+    Posf *prev = s->prev;
     uInt wmask = s->w_mask;
 
 #ifdef UNALIGNED_OK
     /* Compare two bytes at a time. Note: this is not always beneficial.
      * Try with and without -DUNALIGNED_OK to check.
      */
-    register Byte *strend = s->window + s->strstart + MAX_MATCH - 1;
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
     register ush scan_start = *(ush*)scan;
     register ush scan_end   = *(ush*)(scan+best_len-1);
 #else
-    register Byte *strend = s->window + s->strstart + MAX_MATCH;
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
     register Byte scan_end1  = scan[best_len-1];
     register Byte scan_end   = scan[best_len];
 #endif
@@ -524,7 +541,7 @@ local inline int longest_match(s, cur_match)
     if (s->prev_length >= s->good_match) {
         chain_length >>= 2;
     }
-    Assert(s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
 
     do {
         Assert(cur_match < s->strstart, "no future");
@@ -549,6 +566,7 @@ local inline int longest_match(s, cur_match)
          * necessary to put more guard bytes at the end of the window, or
          * to check more often for insufficient lookahead.
          */
+        Assert(scan[2] == match[2], "scan[2]?");
         scan++, match++;
         do {
         } while (*(ush*)(scan+=2) == *(ush*)(match+=2) &&
@@ -579,6 +597,7 @@ local inline int longest_match(s, cur_match)
          * the hash keys are equal and that HASH_BITS >= 8.
          */
         scan += 2, match++;
+        Assert(*scan == *match, "match[2]?");
 
         /* We check for insufficient lookahead only every 8th comparison;
          * the 256th check will be made at strstart+258.
@@ -625,11 +644,13 @@ local void check_match(s, start, match, length)
     int length;
 {
     /* check that the match is indeed a match */
-    if (memcmp((char*)s->window + match,
+    if (memcmp((charf *)s->window + match,
-                (char*)s->window + start, length) != EQUAL) {
+                (charf *)s->window + start, length) != EQUAL) {
         fprintf(stderr,
-            " start %d, match %d, length %d\n",
+            " start %u, match %u, length %d\n",
             start, match, length);
+        do { fprintf(stderr, "%c%c", s->window[match++],
+                     s->window[start++]); } while (--length != 0);
         z_error("invalid match");
     }
     if (verbose > 1) {
@@ -655,7 +676,7 @@ local void fill_window(s)
     deflate_state *s;
 {
     register unsigned n, m;
-    register Pos *p;
+    register Posf *p;
     unsigned more;    /* Amount of free space at the end of the window. */
     uInt wsize = s->w_size;
 
@@ -679,7 +700,7 @@ local void fill_window(s)
             /* By the IN assertion, the window is not empty so we can't confuse
              * more == 0 with more == 64K on a 16 bit machine.
              */
-            zmemcpy((char*)s->window, (char*)s->window+wsize,
+            zmemcpy((charf *)s->window, (charf *)s->window+wsize,
                    (unsigned)wsize);
             s->match_start -= wsize;
             s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
@@ -690,17 +711,17 @@ local void fill_window(s)
                at the expense of memory usage):
              */
             n = s->hash_size;
-            p = &s->head[n-1];
+            p = &s->head[n];
             do {
-                m = *p;
+                m = *--p;
-                *p-- = (Pos)(m >= wsize ? m-wsize : NIL);
+                *p = (Pos)(m >= wsize ? m-wsize : NIL);
             } while (--n);
 
             n = wsize;
-            p = &s->prev[n-1];
+            p = &s->prev[n];
             do {
-                m = *p;
+                m = *--p;
-                *p-- = (Pos)(m >= wsize ? m-wsize : NIL);
+                *p = (Pos)(m >= wsize ? m-wsize : NIL);
                 /* If n is not on any hash chain, prev[n] is garbage but
                  * its value will never be used.
                  */
@@ -723,15 +744,17 @@ local void fill_window(s)
          */
         Assert(more >= 2, "more < 2");
 
-        n = read_buf(s->strm, (char*)s->window + s->strstart + s->lookahead,
+        n = read_buf(s->strm, (charf *)s->window + s->strstart + s->lookahead,
                      more);
         s->lookahead += n;
 
         /* Initialize the hash value now that we have some input: */
-        if (s->strstart == 0 && s->lookahead >= MIN_MATCH-1) {
+        if (s->lookahead >= MIN_MATCH) {
-            for (n=0; n<MIN_MATCH-1; n++) {
+            s->ins_h = s->window[s->strstart];
-                UPDATE_HASH(s, s->ins_h, s->window[n]);
+            UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
-            }
+#if MIN_MATCH != 3
+            Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
         }
         /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
          * but this is not important since only literal bytes will be emitted.
@@ -746,10 +769,11 @@ local void fill_window(s)
  */
 #define FLUSH_BLOCK_ONLY(s, eof) { \
    ct_flush_block(s, (s->block_start >= 0L ? \
-               (char*)&s->window[(unsigned)s->block_start] : \
+               (charf *)&s->window[(unsigned)s->block_start] : \
-               (char*)Z_NULL), (long)s->strstart - s->block_start, (eof)); \
+               (charf *)Z_NULL), (long)s->strstart - s->block_start, (eof)); \
    s->block_start = s->strstart; \
    flush_pending(s->strm); \
+   Tracev((stderr,"[FLUSH]")); \
 }
 
 /* Same but force premature exit if necessary. */
@@ -790,7 +814,9 @@ local int deflate_fast(s, flush)
         /* Insert the string window[strstart .. strstart+2] in the
          * dictionary, and set hash_head to the head of the hash chain:
          */
-        INSERT_STRING(s, s->strstart, hash_head);
+        if (s->lookahead >= MIN_MATCH) {
+            INSERT_STRING(s, s->strstart, hash_head);
+        }
 
         /* Find the longest match, discarding those <= prev_length.
          * At this point we have always match_length < MIN_MATCH
@@ -818,15 +844,14 @@ local int deflate_fast(s, flush)
             /* Insert new strings in the hash table only if the match length
              * is not too large. This saves time but degrades compression.
              */
-            if (s->match_length <= s->max_insert_length) {
+            if (s->match_length <= s->max_insert_length &&
+                s->lookahead >= MIN_MATCH) {
                 s->match_length--; /* string at strstart already in hash table */
                 do {
                     s->strstart++;
                     INSERT_STRING(s, s->strstart, hash_head);
                     /* strstart never exceeds WSIZE-MAX_MATCH, so there are
-                     * always MIN_MATCH bytes ahead. If lookahead < MIN_MATCH
+                     * always MIN_MATCH bytes ahead.
-                     * these bytes are garbage, but it does not matter since
-                     * the next lookahead bytes will be emitted as literals.
                      */
                 } while (--s->match_length != 0);
                 s->strstart++; 
@@ -838,6 +863,9 @@ local int deflate_fast(s, flush)
 #if MIN_MATCH != 3
                 Call UPDATE_HASH() MIN_MATCH-3 more times
 #endif
+                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
+                 * matter since it will be recomputed at next deflate call.
+                 */
             }
         } else {
             /* No match, output a literal byte */
@@ -881,7 +909,9 @@ local int deflate_slow(s, flush)
         /* Insert the string window[strstart .. strstart+2] in the
          * dictionary, and set hash_head to the head of the hash chain:
          */
-        INSERT_STRING(s, s->strstart, hash_head);
+        if (s->lookahead >= MIN_MATCH) {
+            INSERT_STRING(s, s->strstart, hash_head);
+        }
 
         /* Find the longest match, discarding those <= prev_length.
          */
@@ -914,6 +944,8 @@ local int deflate_slow(s, flush)
          * match is not better, output the previous match:
          */
         if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
+            uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
+            /* Do not insert strings in hash table beyond this. */
 
             check_match(s, s->strstart-1, s->prev_match, s->prev_length);
 
@@ -921,18 +953,16 @@ local int deflate_slow(s, flush)
                               s->prev_length - MIN_MATCH);
 
             /* Insert in hash table all strings up to the end of the match.
-             * strstart-1 and strstart are already inserted.
+             * strstart-1 and strstart are already inserted. If there is not
+             * enough lookahead, the last two strings are not inserted in
+             * the hash table.
              */
             s->lookahead -= s->prev_length-1;
             s->prev_length -= 2;
             do {
-                s->strstart++;
+                if (++s->strstart <= max_insert) {
-                INSERT_STRING(s, s->strstart, hash_head);
+                    INSERT_STRING(s, s->strstart, hash_head);
-                /* strstart never exceeds WSIZE-MAX_MATCH, so there are
+                }
-                 * always MIN_MATCH bytes ahead. If lookahead < MIN_MATCH
-                 * these bytes are garbage, but it does not matter since the
-                 * next lookahead bytes will always be emitted as literals.
-                 */
             } while (--s->prev_length != 0);
             s->match_available = 0;
             s->match_length = MIN_MATCH-1;
@@ -961,10 +991,13 @@ local int deflate_slow(s, flush)
             s->lookahead--;
         }
     }
+    Assert (flush != Z_NO_FLUSH, "no flush?");
     if (s->match_available) {
+        Tracevv((stderr,"%c", s->window[s->strstart-1]));
         ct_tally (s, 0, s->window[s->strstart-1]);
         s->match_available = 0;
     }
     FLUSH_BLOCK(s, flush == Z_FINISH);
     return 0;
 }
+

deflate.h

@@ -58,7 +58,7 @@ typedef struct ct_data_s {
         ush  dad;        /* father node in Huffman tree */
         ush  len;        /* length of bit string */
     } dl;
-} ct_data;
+} FAR ct_data;
 
 #define Freq fc.freq
 #define Code fc.code
@@ -71,10 +71,12 @@ typedef struct tree_desc_s {
     ct_data *dyn_tree;           /* the dynamic tree */
     int     max_code;            /* largest code with non zero frequency */
     static_tree_desc *stat_desc; /* the corresponding static tree */
-} tree_desc;
+} FAR tree_desc;
 
 typedef ush Pos;
+typedef Pos FAR Posf;
 typedef unsigned IPos;
+
 /* A Pos is an index in the character window. We use short instead of int to
  * save space in the various tables. IPos is used only for parameter passing.
  */
@@ -82,8 +84,8 @@ typedef unsigned IPos;
 typedef struct internal_state {
     z_stream *strm;      /* pointer back to this zlib stream */
     int   status;        /* as the name implies */
-    Byte *pending_buf;   /* output still pending */
+    Bytef *pending_buf;  /* output still pending */
-    Byte *pending_out;   /* next pending byte to output to the stream */
+    Bytef *pending_out;  /* next pending byte to output to the stream */
     int   pending;       /* nb of bytes in the pending buffer */
     uLong adler;         /* adler32 of uncompressed data */
     int   noheader;      /* suppress zlib header and adler32 */
@@ -96,7 +98,7 @@ typedef struct internal_state {
     uInt  w_bits;        /* log2(w_size)  (8..16) */
     uInt  w_mask;        /* w_size - 1 */
 
-    Byte *window;
+    Bytef *window;
     /* Sliding window. Input bytes are read into the second half of the window,
      * and move to the first half later to keep a dictionary of at least wSize
      * bytes. With this organization, matches are limited to a distance of
@@ -111,13 +113,13 @@ typedef struct internal_state {
      * is directly used as sliding window.
      */
 
-    Pos *prev;
+    Posf *prev;
     /* Link to older string with same hash index. To limit the size of this
      * array to 64K, this link is maintained only for the last 32K strings.
      * An index in this array is thus a window index modulo 32K.
      */
 
-    Pos *head; /* Heads of the hash chains or NIL. */
+    Posf *head; /* Heads of the hash chains or NIL. */
 
     uInt  ins_h;          /* hash index of string to be inserted */
     uInt  hash_size;      /* number of elements in hash table */
@@ -174,14 +176,14 @@ typedef struct internal_state {
      int nice_match; /* Stop searching when current match exceeds this */
 
                 /* used by trees.c: */
+    /* Didn't use ct_data typedef below to supress compiler warning */
+    struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
+    struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
+    struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
 
-    ct_data dyn_ltree[HEAP_SIZE];   /* literal and length tree */
+    struct tree_desc_s l_desc;               /* desc. for literal tree */
-    ct_data dyn_dtree[2*D_CODES+1]; /* distance tree */
+    struct tree_desc_s d_desc;               /* desc. for distance tree */
-    ct_data bl_tree[2*BL_CODES+1];  /* Huffman tree for the bit lengths */
+    struct tree_desc_s bl_desc;              /* desc. for bit length tree */
-
-    tree_desc l_desc;               /* descriptor for literal tree */
-    tree_desc d_desc;               /* descriptor for distance tree */
-    tree_desc bl_desc;              /* descriptor for bit length tree */
 
     ush bl_count[MAX_BITS+1];
     /* number of codes at each bit length for an optimal tree */
@@ -197,7 +199,7 @@ typedef struct internal_state {
     /* Depth of each subtree used as tie breaker for trees of equal frequency
      */
 
-    uch *l_buf;           /* buffer for literals or lengths */
+    uchf *l_buf;          /* buffer for literals or lengths */
 
     uInt  lit_bufsize;
     /* Size of match buffer for literals/lengths.  There are 4 reasons for
@@ -221,7 +223,7 @@ typedef struct internal_state {
 
     uInt last_lit;      /* running index in l_buf */
 
-    ush *d_buf;
+    ushf *d_buf;
     /* Buffer for distances. To simplify the code, d_buf and l_buf have
      * the same number of elements. To use different lengths, an extra flag
      * array would be necessary.
@@ -245,8 +247,7 @@ typedef struct internal_state {
      * are always zero.
      */
 
-} deflate_state;
+} FAR deflate_state;
-
 
 /* Output a byte on the stream.
  * IN assertion: there is enough room in pending_buf.
@@ -265,9 +266,9 @@ typedef struct internal_state {
  */
 
         /* in trees.c */
-void ct_init       __P((deflate_state *s));
+void ct_init       OF((deflate_state *s));
-int  ct_tally      __P((deflate_state *s, int dist, int lc));
+int  ct_tally      OF((deflate_state *s, int dist, int lc));
-ulg ct_flush_block __P((deflate_state *s, char *buf, ulg stored_len, int eof));
+ulg ct_flush_block OF((deflate_state *s, charf *buf, ulg stored_len, int eof));
-void ct_align      __P((deflate_state *s));
+void ct_align      OF((deflate_state *s));
-void ct_stored_block __P((deflate_state *s, char *buf, ulg stored_len,
+void ct_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
                           int eof));

descrip.mms

@@ -0,0 +1,48 @@
+# descrip.mms: MMS description file for building zlib on VMS
+# written by Martin P.J. Zinser <m.zinser@gsi.de>
+
+cc_defs = 
+c_deb = 
+
+.ifdef __DECC__
+pref = /prefix=all
+.endif
+
+OBJS = adler32.obj, compress.obj, crc32.obj, gzio.obj, uncompr.obj,\
+       deflate.obj, trees.obj, zutil.obj, inflate.obj, infblock.obj,\
+       inftrees.obj, infcodes.obj, infutil.obj, inffast.obj
+
+CFLAGS= $(C_DEB) $(CC_DEFS) $(PREF)
+
+all : example.exe minigzip.exe
+        @ write sys$output " Example applications available"
+libz.olb : libz.olb($(OBJS))
+	@ write sys$output " libz available"
+
+example.exe : example.obj libz.olb
+              link example,libz.olb/lib
+
+minigzip.exe : minigzip.obj libz.olb
+              link minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib
+
+clean : 
+	delete *.obj;*,libz.olb;*
+
+
+# Other dependencies.
+adler32.obj : zutil.h zlib.h zconf.h
+compress.obj : zlib.h zconf.h
+crc32.obj : zutil.h zlib.h zconf.h
+deflate.obj : deflate.h zutil.h zlib.h zconf.h
+example.obj : zlib.h zconf.h
+gzio.obj : zutil.h zlib.h zconf.h
+infblock.obj : zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
+infcodes.obj : zutil.h zlib.h zconf.h inftrees.h infutil.h infcodes.h inffast.h
+inffast.obj : zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
+inflate.obj : zutil.h zlib.h zconf.h infblock.h
+inftrees.obj : zutil.h zlib.h zconf.h inftrees.h
+infutil.obj : zutil.h zlib.h zconf.h inftrees.h infutil.h
+minigzip.obj : zlib.h zconf.h
+trees.obj : deflate.h zutil.h zlib.h zconf.h
+uncompr.obj : zlib.h zconf.h
+zutil.obj : zutil.h zlib.h zconf.h

example.c

@@ -13,7 +13,7 @@
 #endif
 
 #ifndef __GO32__
-extern void exit  __P((int));
+extern void exit  OF((int));
 #endif
 
 #define BUFLEN 4096
@@ -31,13 +31,18 @@ extern void exit  __P((int));
     } \
 }
 
-char *hello = "hello world";
+char *hello = "hello, hello!";
+/* "hello world" would be more standard, but the repeated "hello"
+ * stresses the compression code better, sorry...
+ */
 
-void test_compress __P((void));
+void test_compress OF((void));
-void test_gzio     __P((char *out, char *in));
+void test_gzio     OF((char *out, char *in));
-void test_deflate  __P((Byte compr[]));
+void test_deflate  OF((Byte compr[]));
-void test_inflate  __P((Byte compr[]));
+void test_inflate  OF((Byte compr[]));
-void main          __P((int argc, char *argv[]));
+void test_flush    OF((Byte compr[]));
+void test_sync     OF((Byte compr[]));
+int  main          OF((int argc, char *argv[]));
 
 /* ===========================================================================
  * Test compress() and uncompress()
@@ -262,7 +267,7 @@ void test_sync(compr)
  * Usage:  example [output.gz  [input.gz]]
  */
 
-void main(argc, argv)
+int main(argc, argv)
     int argc;
     char *argv[];
 {
@@ -272,7 +277,7 @@ void main(argc, argv)
         fprintf(stderr, "incompatible zlib version\n");
         exit(1);
 
-    } else if (strcmp(zlib_version, ZLIB_VERSION) != 0) {
+    } else if (zstrcmp(zlib_version, ZLIB_VERSION) != 0) {
         fprintf(stderr, "warning: different zlib version\n");
     }
     test_compress();
@@ -287,4 +292,5 @@ void main(argc, argv)
     test_sync(compr);
 
     exit(0);
+    return 0; /* to avoid warning */
 }

gzio.c

@@ -13,8 +13,8 @@ struct internal_state {int dummy;}; /* for buggy compilers */
 
 #define Z_BUFSIZE 4096
 
-#define ALLOC(size) zcalloc((voidp)0, 1, size)
+#define ALLOC(size) malloc(size)
-#define TRYFREE(p) {if (p) zcfree((voidp)0, p);}
+#define TRYFREE(p) {if (p) free(p);}
 
 #define GZ_MAGIC_1 0x1f
 #define GZ_MAGIC_2 0x8b
@@ -46,10 +46,10 @@ typedef struct gz_stream {
 } gz_stream;
 
 
-local int    destroy __P((gz_stream *s));
+local int    destroy OF((gz_stream *s));
-local gzFile gz_open __P((char *path, char *mode, int  fd));
+local gzFile gz_open OF((char *path, char *mode, int  fd));
-local void   putLong __P((FILE *file, uLong x));
+local void   putLong OF((FILE *file, uLong x));
-local uLong  getLong __P((Byte *buf));
+local uLong  getLong OF((Bytef *buf));
 
  /* ===========================================================================
  * Cleanup then free the given gz_stream. Return a zlib error code.
@@ -77,7 +77,7 @@ local int destroy (s)
         err = Z_ERRNO;
     }
     if (s->z_err < 0) err = s->z_err;
-    zcfree((voidp)0, s);
+    TRYFREE(s);
     return err;
 }
 
@@ -96,6 +96,7 @@ local gzFile gz_open (path, mode, fd)
     int  fd;
 {
     int err;
+    int level = Z_DEFAULT_COMPRESSION; /* compression level */
     char *p = mode;
     gz_stream *s = (gz_stream *)ALLOC(sizeof(gz_stream));
 
@@ -123,22 +124,23 @@ local gzFile gz_open (path, mode, fd)
     do {
         if (*p == 'r') s->mode = 'r';
         if (*p == 'w') s->mode = 'w';
+        if (*p >= '1' && *p <= '9') level = *p - '0';
     } while (*p++);
     if (s->mode == '\0') return destroy(s), (gzFile)Z_NULL;
     
     if (s->mode == 'w') {
-        err = deflateInit2(&(s->stream), Z_DEFAULT_COMPRESSION,
+        err = deflateInit2(&(s->stream), level,
                            DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, 0);
         /* windowBits is passed < 0 to suppress zlib header */
 
-        s->stream.next_out = s->outbuf = ALLOC(Z_BUFSIZE);
+        s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
 
         if (err != Z_OK || s->outbuf == Z_NULL) {
             return destroy(s), (gzFile)Z_NULL;
         }
     } else {
         err = inflateInit2(&(s->stream), -MAX_WBITS);
-        s->stream.next_in  = s->inbuf = ALLOC(Z_BUFSIZE);
+        s->stream.next_in  = s->inbuf = (Byte*)ALLOC(Z_BUFSIZE);
 
         if (err != Z_OK || s->inbuf == Z_NULL) {
             return destroy(s), (gzFile)Z_NULL;
@@ -232,7 +234,7 @@ gzFile gzdopen (fd, mode)
 */
 int gzread (file, buf, len)
     gzFile file;
-    voidp buf;
+    voidnp buf;
     unsigned len;
 {
     gz_stream *s = (gz_stream*)file;
@@ -240,7 +242,7 @@ int gzread (file, buf, len)
     if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR;
 
     if (s->transparent) {
-        unsigned n = 0;
+        int n = 0;
         Byte *b = (Byte*)buf;
         /* Copy the first two (non-magic) bytes if not done already */
         while (s->stream.avail_in > 0 && len > 0) {
@@ -281,7 +283,7 @@ int gzread (file, buf, len)
     }
     len -= s->stream.avail_out;
     s->crc = crc32(s->crc, buf, len);
-    return len;
+    return (int)len;
 }
 
 /* ===========================================================================
@@ -290,7 +292,7 @@ int gzread (file, buf, len)
 */
 int gzwrite (file, buf, len)
     gzFile file;
-    voidp buf;
+    voidnp buf;
     unsigned len;
 {
     gz_stream *s = (gz_stream*)file;
@@ -312,12 +314,11 @@ int gzwrite (file, buf, len)
             s->stream.avail_out = Z_BUFSIZE;
         }
         s->z_err = deflate(&(s->stream), Z_NO_FLUSH);
-
         if (s->z_err != Z_OK) break;
     }
     s->crc = crc32(s->crc, buf, len);
 
-    return len - s->stream.avail_in;
+    return (int)(len - s->stream.avail_in);
 }
 
 /* ===========================================================================
@@ -359,6 +360,7 @@ int gzflush (file, flush)
  
         if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break;
     }
+    fflush(s->file);
     return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
 }
 
@@ -380,10 +382,10 @@ local void putLong (file, x)
    Reads a long in LSB order from the given buffer
 */
 local uLong getLong (buf)
-    Byte *buf;
+    Bytef *buf;
 {
     uLong x = 0;
-    Byte *p = buf+4;
+    Bytef *p = buf+4;
 
     do {
         x <<= 8;
@@ -417,7 +419,7 @@ int gzclose (file)
         /* slide CRC and original size if they are at the end of inbuf */
         if ((n = s->stream.avail_in) < 8  && !s->z_eof) {
             Byte *p = s->inbuf;
-            Byte *q = s->stream.next_in;
+	    Bytef *q = s->stream.next_in;
             while (n--) { *p++ = *q++; };
 
             n = s->stream.avail_in;

infblock.c

@@ -62,9 +62,9 @@ local uInt border[] = { /* Order of the bit length code lengths */
 
 
 void inflate_blocks_reset(s, z, c)
-struct inflate_blocks_state *s;
+inflate_blocks_statef *s;
 z_stream *z;
-uLong *c;
+uLongf *c;
 {
   if (s->checkfn != Z_NULL)
     *c = s->check;
@@ -86,17 +86,17 @@ uLong *c;
 }
 
 
-struct inflate_blocks_state *inflate_blocks_new(z, c, w)
+inflate_blocks_statef *inflate_blocks_new(z, c, w)
 z_stream *z;
 check_func c;
 uInt w;
 {
-  struct inflate_blocks_state *s;
+  inflate_blocks_statef *s;
 
-  if ((s = (struct inflate_blocks_state *)ZALLOC
+  if ((s = (inflate_blocks_statef *)ZALLOC
        (z,1,sizeof(struct inflate_blocks_state))) == Z_NULL)
     return s;
-  if ((s->window = (Byte *)ZALLOC(z, 1, w)) == Z_NULL)
+  if ((s->window = (Bytef *)ZALLOC(z, 1, w)) == Z_NULL)
   {
     ZFREE(z, s);
     return Z_NULL;
@@ -111,16 +111,16 @@ uInt w;
 
 
 int inflate_blocks(s, z, r)
-struct inflate_blocks_state *s;
+inflate_blocks_statef *s;
 z_stream *z;
 int r;
 {
   uInt t;               /* temporary storage */
   uLong b;              /* bit buffer */
   uInt k;               /* bits in bit buffer */
-  Byte *p;              /* input data pointer */
+  Bytef *p;             /* input data pointer */
   uInt n;               /* bytes available there */
-  Byte *q;              /* output window write pointer */
+  Bytef *q;             /* output window write pointer */
   uInt m;               /* bytes to end of window or read pointer */
 
   /* copy input/output information to locals (UPDATE macro restores) */
@@ -179,7 +179,7 @@ int r;
       break;
     case LENS:
       NEEDBITS(32)
-      if ((~b) >> 16 != (b & 0xffff))
+      if (((~b) >> 16) != (b & 0xffff))
       {
         s->mode = BAD;
         z->msg = "invalid stored block lengths";
@@ -223,7 +223,7 @@ int r;
       t = 258 + (t & 0x1f) + ((t >> 5) & 0x1f);
       if (t < 19)
         t = 19;
-      if ((s->sub.trees.blens = (uInt*)ZALLOC(z, t, sizeof(uInt))) == Z_NULL)
+      if ((s->sub.trees.blens = (uIntf*)ZALLOC(z, t, sizeof(uInt))) == Z_NULL)
       {
         r = Z_MEM_ERROR;
         LEAVE
@@ -301,10 +301,10 @@ int r;
       {
         uInt bl, bd;
         inflate_huft *tl, *td;
-        struct inflate_codes_state *c;
+        inflate_codes_statef *c;
 
-        bl = 9;
+        bl = 9;         /* must be <= 9 for lookahead assumptions */
-        bd = 6;
+        bd = 6;         /* must be <= 9 for lookahead assumptions */
         t = s->sub.trees.table;
         t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f),
                                   s->sub.trees.blens, &bl, &bd, &tl, &td, z);
@@ -373,9 +373,9 @@ int r;
 
 
 int inflate_blocks_free(s, z, c)
-struct inflate_blocks_state *s;
+inflate_blocks_statef *s;
 z_stream *z;
-uLong *c;
+uLongf *c;
 {
   inflate_blocks_reset(s, z, c);
   ZFREE(z, s->window);

infblock.h

@@ -9,23 +9,24 @@
  */
 
 struct inflate_blocks_state;
+typedef struct inflate_blocks_state FAR inflate_blocks_statef;
 
-extern struct inflate_blocks_state * inflate_blocks_new __P((
+extern inflate_blocks_statef * inflate_blocks_new OF((
-    z_stream *,
+    z_stream *z,
-    check_func,                 /* check function */
+    check_func c,               /* check function */
-    uInt));                     /* window size */
+    uInt w));                   /* window size */
 
-extern int inflate_blocks __P((
+extern int inflate_blocks OF((
-    struct inflate_blocks_state *,
+    inflate_blocks_statef *,
     z_stream *,
     int));                      /* initial return code */
 
-extern void inflate_blocks_reset __P((
+extern void inflate_blocks_reset OF((
-    struct inflate_blocks_state *,
+    inflate_blocks_statef *,
     z_stream *,
-    uLong *));                  /* check value on output */
+    uLongf *));                  /* check value on output */
 
-extern int inflate_blocks_free __P((
+extern int inflate_blocks_free OF((
-    struct inflate_blocks_state *,
+    inflate_blocks_statef *,
     z_stream *,
-    uLong *));                  /* check value on output */
+    uLongf *));                  /* check value on output */

infcodes.c

@@ -5,9 +5,10 @@
 
 #include "zutil.h"
 #include "inftrees.h"
+#include "infblock.h"
+#include "infcodes.h"
 #include "infutil.h"
 #include "inffast.h"
-#include "infcodes.h"
 
 /* simplify the use of the inflate_huft type with some defines */
 #define base more.Base
@@ -55,14 +56,14 @@ struct inflate_codes_state {
 };
 
 
-struct inflate_codes_state *inflate_codes_new(bl, bd, tl, td, z)
+inflate_codes_statef *inflate_codes_new(bl, bd, tl, td, z)
 uInt bl, bd;
 inflate_huft *tl, *td;
 z_stream *z;
 {
-  struct inflate_codes_state *c;
+  inflate_codes_statef *c;
 
-  if ((c = (struct inflate_codes_state *)
+  if ((c = (inflate_codes_statef *)
        ZALLOC(z,1,sizeof(struct inflate_codes_state))) != Z_NULL)
   {
     c->mode = START;
@@ -77,7 +78,7 @@ z_stream *z;
 
 
 int inflate_codes(s, z, r)
-struct inflate_blocks_state *s;
+inflate_blocks_statef *s;
 z_stream *z;
 int r;
 {
@@ -86,12 +87,12 @@ int r;
   uInt e;               /* extra bits or operation */
   uLong b;              /* bit buffer */
   uInt k;               /* bits in bit buffer */
-  Byte *p;              /* input data pointer */
+  Bytef *p;             /* input data pointer */
   uInt n;               /* bytes available there */
-  Byte *q;              /* output window write pointer */
+  Bytef *q;             /* output window write pointer */
   uInt m;               /* bytes to end of window or read pointer */
-  Byte *f;              /* pointer to copy strings from */
+  Bytef *f;             /* pointer to copy strings from */
-  struct inflate_codes_state *c = s->sub.decode.codes;  /* codes state */
+  inflate_codes_statef *c = s->sub.decode.codes;  /* codes state */
 
   /* copy input/output information to locals (UPDATE macro restores) */
   LOAD
@@ -194,9 +195,15 @@ int r;
       Tracevv((stderr, "inflate:         distance %u\n", c->sub.copy.dist));
       c->mode = COPY;
     case COPY:          /* o: copying bytes in window, waiting for space */
+#ifndef __TURBOC__ /* Turbo C bug for following expression */
       f = (uInt)(q - s->window) < c->sub.copy.dist ?
           s->end - (c->sub.copy.dist - (q - s->window)) :
           q - c->sub.copy.dist;
+#else
+      f = q - c->sub.copy.dist;
+      if ((uInt)(q - s->window) < c->sub.copy.dist)
+        f = s->end - (c->sub.copy.dist - (q - s->window));
+#endif
       while (c->len)
       {
         NEEDOUT
@@ -231,7 +238,7 @@ int r;
 
 
 void inflate_codes_free(c, z)
-struct inflate_codes_state *c;
+inflate_codes_statef *c;
 z_stream *z;
 {
   ZFREE(z, c);

infcodes.h

@@ -9,17 +9,19 @@
  */
 
 struct inflate_codes_state;
+typedef struct inflate_codes_state FAR inflate_codes_statef;
 
-extern struct inflate_codes_state *inflate_codes_new __P((
+extern inflate_codes_statef *inflate_codes_new OF((
     uInt, uInt,
     inflate_huft *, inflate_huft *,
     z_stream *));
 
-extern int inflate_codes __P((
+extern int inflate_codes OF((
-    struct inflate_blocks_state *,
+    inflate_blocks_statef *,
     z_stream *,
     int));
 
-extern void inflate_codes_free __P((
+extern void inflate_codes_free OF((
-    struct inflate_codes_state *,
+    inflate_codes_statef *,
     z_stream *));
+

inffast.c

@@ -5,6 +5,8 @@
 
 #include "zutil.h"
 #include "inftrees.h"
+#include "infblock.h"
+#include "infcodes.h"
 #include "infutil.h"
 #include "inffast.h"
 
@@ -28,22 +30,22 @@ struct inflate_codes_state {int dummy;}; /* for buggy compilers */
 int inflate_fast(bl, bd, tl, td, s, z)
 uInt bl, bd;
 inflate_huft *tl, *td;
-struct inflate_blocks_state *s;
+inflate_blocks_statef *s;
 z_stream *z;
 {
   inflate_huft *t;      /* temporary pointer */
   uInt e;               /* extra bits or operation */
   uLong b;              /* bit buffer */
   uInt k;               /* bits in bit buffer */
-  Byte *p;              /* input data pointer */
+  Bytef *p;             /* input data pointer */
   uInt n;               /* bytes available there */
-  Byte *q;              /* output window write pointer */
+  Bytef *q;             /* output window write pointer */
   uInt m;               /* bytes to end of window or read pointer */
   uInt ml;              /* mask for literal/length tree */
   uInt md;              /* mask for distance tree */
   uInt c;               /* bytes to copy */
   uInt d;               /* distance back to copy from */
-  Byte *r;              /* copy source pointer */
+  Bytef *r;             /* copy source pointer */
 
   /* load input, output, bit values */
   LOAD

inffast.h

@@ -8,10 +8,10 @@
    subject to change. Applications should only use zlib.h.
  */
 
-extern int inflate_fast __P((
+extern int inflate_fast OF((
     uInt,
     uInt,
     inflate_huft *,
     inflate_huft *,
-    struct inflate_blocks_state *,
+    inflate_blocks_statef *,
     z_stream *));

inflate.c

@@ -37,7 +37,7 @@ struct internal_state {
   /* mode independent information */
   int  nowrap;          /* flag for no wrapper */
   uInt wbits;           /* log2(window size)  (8..15, defaults to 15) */
-  struct inflate_blocks_state
+  inflate_blocks_statef 
     *blocks;            /* current inflate_blocks state */
 
 };
@@ -84,7 +84,7 @@ int w;
     return Z_STREAM_ERROR;
   if (z->zalloc == Z_NULL) z->zalloc = zcalloc;
   if (z->zfree == Z_NULL) z->zfree = zcfree;
-  if ((z->state = (struct internal_state *)
+  if ((z->state = (struct internal_state FAR *)
        ZALLOC(z,1,sizeof(struct internal_state))) == Z_NULL)
     return Z_MEM_ERROR;
   z->state->blocks = Z_NULL;
@@ -235,7 +235,7 @@ int inflateSync(z)
 z_stream *z;
 {
   uInt n;       /* number of bytes to look at */
-  Byte *p;      /* pointer to bytes */
+  Bytef *p;     /* pointer to bytes */
   uInt m;       /* number of marker bytes found in a row */
   uLong r, w;   /* temporaries to save total_in and total_out */
 

inftrees.c

@@ -15,22 +15,22 @@ struct internal_state  {int dummy;}; /* for buggy compilers */
 #define bits word.what.Bits
 
 
-local int huft_build __P((
+local int huft_build OF((
-    uInt *,             /* code lengths in bits */
+    uIntf *,            /* code lengths in bits */
     uInt,               /* number of codes */
     uInt,               /* number of "simple" codes */
-    uInt *,             /* list of base values for non-simple codes */
+    uIntf *,            /* list of base values for non-simple codes */
-    uInt *,             /* list of extra bits for non-simple codes */
+    uIntf *,            /* list of extra bits for non-simple codes */
-    inflate_huft **,    /* result: starting table */
+    inflate_huft * FAR*,/* result: starting table */
-    uInt *,             /* maximum lookup bits (returns actual) */
+    uIntf *,            /* maximum lookup bits (returns actual) */
     z_stream *));       /* for zalloc function */
 
-local voidp falloc __P((
+local voidp falloc OF((
     voidp,              /* opaque pointer (not used) */
     uInt,               /* number of items */
     uInt));             /* size of item */
 
-local void ffree __P((
+local void ffree OF((
     voidp q,            /* opaque pointer (not used) */
     voidp p));          /* what to free (not used) */
 
@@ -93,13 +93,13 @@ local uInt cpdext[] = { /* Extra bits for distance codes */
 #endif
 
 local int huft_build(b, n, s, d, e, t, m, zs)
-uInt *b;                /* code lengths in bits (all assumed <= BMAX) */
+uIntf *b;               /* code lengths in bits (all assumed <= BMAX) */
 uInt n;                 /* number of codes (assumed <= N_MAX) */
 uInt s;                 /* number of simple-valued codes (0..s-1) */
-uInt *d;                /* list of base values for non-simple codes */
+uIntf *d;               /* list of base values for non-simple codes */
-uInt *e;                /* list of extra bits for non-simple codes */
+uIntf *e;               /* list of extra bits for non-simple codes */  
-inflate_huft **t;       /* result: starting table */
+inflate_huft * FAR *t;  /* result: starting table */
-uInt *m;                /* maximum lookup bits, returns actual */
+uIntf *m;               /* maximum lookup bits, returns actual */
 z_stream *zs;           /* for zalloc function */
 /* Given a list of code lengths and a maximum table size, make a set of
    tables to decode that set of codes.  Return Z_OK on success, Z_BUF_ERROR
@@ -107,6 +107,7 @@ z_stream *zs;           /* for zalloc function */
    case), Z_DATA_ERROR if the input is invalid (all zero length codes or an
    over-subscribed set of lengths), or Z_MEM_ERROR if not enough memory. */
 {
+
   uInt a;                       /* counter for codes of length k */
   uInt c[BMAX+1];               /* bit length count table */
   uInt f;                       /* i repeats in table every f entries */
@@ -116,14 +117,14 @@ z_stream *zs;           /* for zalloc function */
   register uInt j;              /* counter */
   register int k;               /* number of bits in current code */
   int l;                        /* bits per table (returned in m) */
-  register uInt *p;             /* pointer into c[], b[], or v[] */
+  register uIntf *p;            /* pointer into c[], b[], or v[] */
-  register inflate_huft *q;     /* points to current table */
+  inflate_huft *q;              /* points to current table */
-  inflate_huft r;               /* table entry for structure assignment */
+  struct inflate_huft_s r;      /* table entry for structure assignment */
   inflate_huft *u[BMAX];        /* table stack */
   uInt v[N_MAX];                /* values in order of bit length */
   register int w;               /* bits before this table == (l * h) */
   uInt x[BMAX+1];               /* bit offsets, then code stack */
-  uInt *xp;                     /* pointer into x */
+  uIntf *xp;                    /* pointer into x */
   int y;                        /* number of dummy codes added */
   uInt z;                       /* number of entries in current table */
 
@@ -238,7 +239,7 @@ z_stream *zs;           /* for zalloc function */
         inflate_hufts += z + 1;
 #endif
         *t = q + 1;             /* link to list for huft_free() */
-        *(t = &(q->next)) = (inflate_huft *)Z_NULL;
+        *(t = &(q->next)) = Z_NULL;
         u[h] = ++q;             /* table starts after link */
 
         /* connect to last table, if there is one */
@@ -246,7 +247,7 @@ z_stream *zs;           /* for zalloc function */
         {
           x[h] = i;             /* save pattern for backing up */
           r.bits = (Byte)l;     /* bits to dump before this table */
-          r.exop = j;           /* bits in this table */
+          r.exop = (Byte)j;     /* bits in this table */
           r.next = q;           /* pointer to this table */
           j = i >> (w - l);     /* (get around Turbo C bug) */
           u[h-1][j] = r;        /* connect to last table */
@@ -259,12 +260,12 @@ z_stream *zs;           /* for zalloc function */
         r.exop = 128 + 64;      /* out of values--invalid code */
       else if (*p < s)
       {
-        r.exop = (*p < 256 ? 0 : 32 + 64);      /* 256 is end-of-block */
+        r.exop = (Byte)(*p < 256 ? 0 : 32 + 64);     /* 256 is end-of-block */
         r.base = *p++;          /* simple code is just the value */
       }
       else
       {
-        r.exop = e[*p - s] + 16 + 64;   /* non-simple--look up in lists */
+        r.exop = (Byte)e[*p - s] + 16 + 64; /* non-simple--look up in lists */
         r.base = d[*p++ - s];
       }
 
@@ -294,14 +295,14 @@ z_stream *zs;           /* for zalloc function */
 
 
 int inflate_trees_bits(c, bb, tb, z)
-uInt *c;                /* 19 code lengths */
+uIntf *c;               /* 19 code lengths */
-uInt *bb;               /* bits tree desired/actual depth */
+uIntf *bb;              /* bits tree desired/actual depth */
-inflate_huft **tb;      /* bits tree result */
+inflate_huft * FAR *tb; /* bits tree result */
 z_stream *z;            /* for zfree function */
 {
   int r;
 
-  r = huft_build(c, 19, 19, (uInt*)Z_NULL, (uInt*)Z_NULL, tb, bb, z);
+  r = huft_build(c, 19, 19, (uIntf*)Z_NULL, (uIntf*)Z_NULL, tb, bb, z);
   if (r == Z_DATA_ERROR)
     z->msg = "oversubscribed dynamic bit lengths tree";
   else if (r == Z_BUF_ERROR)
@@ -317,11 +318,11 @@ z_stream *z;            /* for zfree function */
 int inflate_trees_dynamic(nl, nd, c, bl, bd, tl, td, z)
 uInt nl;                /* number of literal/length codes */
 uInt nd;                /* number of distance codes */
-uInt *c;                /* that many (total) code lengths */
+uIntf *c;               /* that many (total) code lengths */
-uInt *bl;               /* literal desired/actual bit depth */
+uIntf *bl;              /* literal desired/actual bit depth */
-uInt *bd;               /* distance desired/actual bit depth */
+uIntf *bd;              /* distance desired/actual bit depth */
-inflate_huft **tl;      /* literal/length tree result */
+inflate_huft * FAR *tl; /* literal/length tree result */
-inflate_huft **td;      /* distance tree result */
+inflate_huft * FAR *td; /* distance tree result */
 z_stream *z;            /* for zfree function */
 {
   int r;
@@ -399,10 +400,10 @@ voidp p;
 
 
 int inflate_trees_fixed(bl, bd, tl, td)
-uInt *bl;               /* literal desired/actual bit depth */
+uIntf *bl;               /* literal desired/actual bit depth */
-uInt *bd;               /* distance desired/actual bit depth */
+uIntf *bd;               /* distance desired/actual bit depth */
-inflate_huft **tl;      /* literal/length tree result */
+inflate_huft * FAR *tl;  /* literal/length tree result */
-inflate_huft **td;      /* distance tree result */
+inflate_huft * FAR *td;  /* distance tree result */
 {
   /* build fixed tables if not built already--lock out other instances */
   while (++fixed_lock > 1)

inftrees.h

@@ -11,14 +11,15 @@
 /* Huffman code lookup table entry--this entry is four bytes for machines
    that have 16-bit pointers (e.g. PC's in the small or medium model). */
 
-typedef struct inflate_huft_s inflate_huft;
+typedef struct inflate_huft_s FAR inflate_huft;
+
 struct inflate_huft_s {
   union {
     struct {
       Byte Exop;        /* number of extra bits or operation */
       Byte Bits;        /* number of bits in this code or subcode */
     } what;
-    Byte *pad;          /* pad structure to a power of 2 (4 bytes for */
+    Bytef *pad;         /* pad structure to a power of 2 (4 bytes for */
   } word;               /*  16-bit, 8 bytes for 32-bit machines) */
   union {
     uInt Base;          /* literal, length base, or distance base */
@@ -30,28 +31,29 @@ struct inflate_huft_s {
   extern uInt inflate_hufts;
 #endif
 
-extern int inflate_trees_bits __P((
+extern int inflate_trees_bits OF((
-    uInt *,                     /* 19 code lengths */
+    uIntf *,                    /* 19 code lengths */
-    uInt *,                     /* bits tree desired/actual depth */
+    uIntf *,                    /* bits tree desired/actual depth */
-    inflate_huft **,            /* bits tree result */
+    inflate_huft * FAR *,       /* bits tree result */
     z_stream *));               /* for zalloc, zfree functions */
 
-extern int inflate_trees_dynamic __P((
+extern int inflate_trees_dynamic OF((
     uInt,                       /* number of literal/length codes */
     uInt,                       /* number of distance codes */
-    uInt *,                     /* that many (total) code lengths */
+    uIntf *,                    /* that many (total) code lengths */
-    uInt *,                     /* literal desired/actual bit depth */
+    uIntf *,                    /* literal desired/actual bit depth */
-    uInt *,                     /* distance desired/actual bit depth */
+    uIntf *,                    /* distance desired/actual bit depth */
-    inflate_huft **,            /* literal/length tree result */
+    inflate_huft * FAR *,       /* literal/length tree result */
-    inflate_huft **,            /* distance tree result */
+    inflate_huft * FAR *,       /* distance tree result */
     z_stream *));               /* for zalloc, zfree functions */
 
-extern int inflate_trees_fixed __P((
+extern int inflate_trees_fixed OF((
-    uInt *,                     /* literal desired/actual bit depth */
+    uIntf *,                    /* literal desired/actual bit depth */
-    uInt *,                     /* distance desired/actual bit depth */
+    uIntf *,                    /* distance desired/actual bit depth */
-    inflate_huft **,            /* literal/length tree result */
+    inflate_huft * FAR *,       /* literal/length tree result */
-    inflate_huft **));          /* distance tree result */
+    inflate_huft * FAR *));     /* distance tree result */
 
-extern int inflate_trees_free __P((
+extern int inflate_trees_free OF((
     inflate_huft *,             /* tables to free */
     z_stream *));               /* for zfree function */
+

infutil.c

@@ -4,7 +4,9 @@
  */
 
 #include "zutil.h"
+#include "infblock.h"
 #include "inftrees.h"
+#include "infcodes.h"
 #include "infutil.h"
 
 struct inflate_codes_state {int dummy;}; /* for buggy compilers */
@@ -19,12 +21,12 @@ uInt inflate_mask[] = {
 
 /* copy as much as possible from the sliding window to the output area */
 int inflate_flush(s, z, r)
-struct inflate_blocks_state *s;
+inflate_blocks_statef *s;
 z_stream *z;
 int r;
 {
   uInt n;
-  Byte *p, *q;
+  Bytef *p, *q;
 
   /* local copies of source and destination pointers */
   p = z->next_out;

infutil.h

@@ -31,14 +31,14 @@ struct inflate_blocks_state {
     struct {
       uInt table;               /* table lengths (14 bits) */
       uInt index;               /* index into blens (or border) */
-      uInt *blens;              /* bit lengths of codes */
+      uIntf *blens;             /* bit lengths of codes */
       uInt bb;                  /* bit length tree depth */
       inflate_huft *tb;         /* bit length decoding tree */
     } trees;            /* if DTREE, decoding info for trees */
     struct {
       inflate_huft *tl, *td;    /* trees to free */
-      struct inflate_codes_state
+      inflate_codes_statef 
-        *codes;
+         *codes;
     } decode;           /* if CODES, current state */
   } sub;                /* submode */
   uInt last;            /* true if this block is the last block */
@@ -46,15 +46,16 @@ struct inflate_blocks_state {
   /* mode independent information */
   uInt bitk;            /* bits in bit buffer */
   uLong bitb;           /* bit buffer */
-  Byte *window;         /* sliding window */
+  Bytef *window;        /* sliding window */
-  Byte *end;            /* one byte after sliding window */
+  Bytef *end;           /* one byte after sliding window */
-  Byte *read;           /* window read pointer */
+  Bytef *read;          /* window read pointer */
-  Byte *write;          /* window write pointer */
+  Bytef *write;         /* window write pointer */
   check_func checkfn;   /* check function */
   uLong check;          /* check on output */
 
 };
 
+
 /* defines for inflate input/output */
 /*   update pointers and return */
 #define UPDBITS {s->bitb=b;s->bitk=k;}
@@ -82,8 +83,8 @@ struct inflate_blocks_state {
 extern uInt inflate_mask[];
 
 /* copy as much as possible from the sliding window to the output area */
-extern int inflate_flush __P((
+extern int inflate_flush OF((
-    struct inflate_blocks_state *,
+    inflate_blocks_statef *,
     z_stream *,
     int));
 

minigzip.c

@@ -19,9 +19,9 @@
 #include "zlib.h"
 
 #ifndef __GO32__
-extern void exit  __P((int));
+extern void exit  OF((int));
 #endif
-extern int unlink __P((const char *));
+extern int unlink OF((const char *));
 
 #ifdef STDC
 #  include <string.h>
@@ -35,6 +35,13 @@ extern int unlink __P((const char *));
 #  define SET_BINARY_MODE(file)
 #endif
 
+#ifdef VMS
+#  define GZ_SUFFIX "-gz"
+#else
+#  define GZ_SUFFIX ".gz"
+#endif
+#define SUFFIX_LEN sizeof(GZ_SUFFIX)
+
 #define BUFLEN 4096
 #define MAX_NAME_LEN 1024
 
@@ -46,12 +53,12 @@ extern int unlink __P((const char *));
 
 char *prog;
 
-void error           __P((char *msg));
+void error           OF((char *msg));
-void gz_compress     __P((FILE   *in, gzFile out));
+void gz_compress     OF((FILE   *in, gzFile out));
-void gz_uncompress   __P((gzFile in, FILE   *out));
+void gz_uncompress   OF((gzFile in, FILE   *out));
-void file_compress   __P((char  *file));
+void file_compress   OF((char  *file));
-void file_uncompress __P((char  *file));
+void file_uncompress OF((char  *file));
-void main            __P((int argc, char *argv[]));
+int  main            OF((int argc, char *argv[]));
 
 /* ===========================================================================
  * Display error message and exit
@@ -124,14 +131,14 @@ void file_compress(file)
     gzFile out;
 
     strcpy(outfile, file);
-    strcat(outfile, ".gz");
+    strcat(outfile, GZ_SUFFIX);
 
     in = fopen(file, "rb");
     if (in == NULL) {
         perror(file);
         exit(1);
     }
-    out = gzopen(outfile, "wb");
+    out = gzopen(outfile, "wb"); /* use "wb9" for maximal compression */
     if (out == NULL) {
         fprintf(stderr, "%s: can't gzopen %s\n", prog, outfile);
         exit(1);
@@ -156,14 +163,14 @@ void file_uncompress(file)
 
     strcpy(buf, file);
 
-    if (len > 3 && strcmp(file+len-3, ".gz") == 0) {
+    if (len > SUFFIX_LEN && strcmp(file+len-SUFFIX_LEN, GZ_SUFFIX) == 0) {
         infile = file;
         outfile = buf;
         outfile[len-3] = '\0';
     } else {
         outfile = file;
         infile = buf;
-        strcat(infile, ".gz");
+        strcat(infile, GZ_SUFFIX);
     }
     in = gzopen(infile, "rb");
     if (in == NULL) {
@@ -186,7 +193,7 @@ void file_uncompress(file)
  * Usage:  minigzip [-d] [files...]
  */
 
-void main(argc, argv)
+int main(argc, argv)
     int argc;
     char *argv[];
 {
@@ -210,7 +217,7 @@ void main(argc, argv)
             if (file == NULL) error("can't gzdopen stdin");
             gz_uncompress(file, stdout);
         } else {
-            file = gzdopen(fileno(stdout), "wb");
+            file = gzdopen(fileno(stdout), "wb"); /* "wb9" for max compr. */
             if (file == NULL) error("can't gzdopen stdout");
             gz_compress(stdin, file);
         }
@@ -224,4 +231,5 @@ void main(argc, argv)
         } while (argv++, --argc);
     }
     exit(0);
+    return 0; /* to avoid warning */
 }

trees.c

@@ -110,7 +110,7 @@ local int base_dist[D_CODES];
 
 struct static_tree_desc_s {
     ct_data *static_tree;        /* static tree or NULL */
-    int     *extra_bits;         /* extra bits for each code or NULL */
+    intf    *extra_bits;         /* extra bits for each code or NULL */
     int     extra_base;          /* base index for extra_bits */
     int     elems;               /* max number of elements in the tree */
     int     max_length;          /* max bit length for the codes */
@@ -129,25 +129,25 @@ local static_tree_desc  static_bl_desc =
  * Local (static) routines in this file.
  */
 
-local void ct_static_init __P((void));
+local void ct_static_init OF((void));
-local void init_block     __P((deflate_state *s));
+local void init_block     OF((deflate_state *s));
-local void pqdownheap     __P((deflate_state *s, ct_data *tree, int k));
+local void pqdownheap     OF((deflate_state *s, ct_data *tree, int k));
-local void gen_bitlen     __P((deflate_state *s, tree_desc *desc));
+local void gen_bitlen     OF((deflate_state *s, tree_desc *desc));
-local void gen_codes      __P((ct_data *tree, int max_code, ush bl_count[]));
+local void gen_codes      OF((ct_data *tree, int max_code, ushf *bl_count));
-local void build_tree     __P((deflate_state *s, tree_desc *desc));
+local void build_tree     OF((deflate_state *s, tree_desc *desc));
-local void scan_tree      __P((deflate_state *s, ct_data *tree, int max_code));
+local void scan_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local void send_tree      __P((deflate_state *s, ct_data *tree, int max_code));
+local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local int  build_bl_tree  __P((deflate_state *s));
+local int  build_bl_tree  OF((deflate_state *s));
-local void send_all_trees __P((deflate_state *s, int lcodes, int dcodes,
+local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
                               int blcodes));
-local void compress_block __P((deflate_state *s, ct_data *ltree,
+local void compress_block OF((deflate_state *s, ct_data *ltree,
                               ct_data *dtree));
-local void set_data_type  __P((deflate_state *s));
+local void set_data_type  OF((deflate_state *s));
-local void send_bits      __P((deflate_state *s, int value, int length));
+local void send_bits      OF((deflate_state *s, int value, int length));
-local unsigned bi_reverse __P((unsigned value, int length));
+local unsigned bi_reverse OF((unsigned value, int length));
-local void bi_windup      __P((deflate_state *s));
+local void bi_windup      OF((deflate_state *s));
-local void copy_block     __P((deflate_state *s, char *buf, unsigned len,
+local void copy_block     OF((deflate_state *s, charf *buf, unsigned len,
-                               int header));
+                              int header));
 
 #ifndef DEBUG
 #  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
@@ -356,7 +356,7 @@ local void gen_bitlen(s, desc)
     ct_data *tree  = desc->dyn_tree;
     int max_code   = desc->max_code;
     ct_data *stree = desc->stat_desc->static_tree;
-    int *extra     = desc->stat_desc->extra_bits;
+    intf *extra    = desc->stat_desc->extra_bits;
     int base       = desc->stat_desc->extra_base;
     int max_length = desc->stat_desc->max_length;
     int h;              /* heap index */
@@ -439,7 +439,7 @@ local void gen_bitlen(s, desc)
 local void gen_codes (tree, max_code, bl_count)
     ct_data *tree;             /* the tree to decorate */
     int max_code;              /* largest code with non zero frequency */
-    ush bl_count[];            /* number of codes at each bit length */
+    ushf *bl_count;            /* number of codes at each bit length */
 {
     ush next_code[MAX_BITS+1]; /* next code value for each bit length */
     ush code = 0;              /* running code value */
@@ -487,8 +487,7 @@ local void build_tree(s, desc)
     int elems       = desc->stat_desc->elems;
     int n, m;          /* iterate over heap elements */
     int max_code = -1; /* largest code with non zero frequency */
-    int node = elems;  /* next internal node of the tree */
+    int node;          /* new node being created */
-    int new;           /* new node being created */
 
     /* Construct the initial heap, with least frequent element in
      * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
@@ -511,11 +510,11 @@ local void build_tree(s, desc)
      * two codes of non zero frequency.
      */
     while (s->heap_len < 2) {
-        new = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);
+        node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);
-        tree[new].Freq = 1;
+        tree[node].Freq = 1;
-        s->depth[new] = 0;
+        s->depth[node] = 0;
-        s->opt_len--; if (stree) s->static_len -= stree[new].Len;
+        s->opt_len--; if (stree) s->static_len -= stree[node].Len;
-        /* new is 0 or 1 so it does not have extra bits */
+        /* node is 0 or 1 so it does not have extra bits */
     }
     desc->max_code = max_code;
 
@@ -527,6 +526,7 @@ local void build_tree(s, desc)
     /* Construct the Huffman tree by repeatedly combining the least two
      * frequent nodes.
      */
+    node = elems;              /* next internal node of the tree */
     do {
         pqremove(s, tree, n);  /* n = node of least frequency */
         m = s->heap[SMALLEST]; /* m = node of next least frequency */
@@ -727,7 +727,7 @@ local void send_all_trees(s, lcodes, dcodes, blcodes)
  */
 void ct_stored_block(s, buf, stored_len, eof)
     deflate_state *s;
-    char *buf;        /* input block */
+    charf *buf;       /* input block */
     ulg stored_len;   /* length of input block */
     int eof;          /* true if this is the last block for a file */
 {
@@ -756,7 +756,7 @@ void ct_align(s)
  */
 ulg ct_flush_block(s, buf, stored_len, eof)
     deflate_state *s;
-    char *buf;        /* input block, or NULL if too old */
+    charf *buf;       /* input block, or NULL if too old */
     ulg stored_len;   /* length of input block */
     int eof;          /* true if this is the last block for a file */
 {
@@ -804,7 +804,7 @@ ulg ct_flush_block(s, buf, stored_len, eof)
     if (stored_len <= opt_lenb && eof && s->compressed_len==0L && seekable()) {
 #  endif
         /* Since LIT_BUFSIZE <= 2*WSIZE, the input data must be there: */
-        if (buf == (char*)0) error ("block vanished");
+        if (buf == (charf*)0) error ("block vanished");
 
         copy_block(buf, (unsigned)stored_len, 0); /* without header */
         s->compressed_len = stored_len << 3;
@@ -1049,7 +1049,7 @@ local void bi_windup(s)
  */
 local void copy_block(s, buf, len, header)
     deflate_state *s;
-    char     *buf;    /* the input data */
+    charf    *buf;    /* the input data */
     unsigned len;     /* its length */
     int      header;  /* true if block header must be written */
 {

uncompr.c

@@ -23,9 +23,9 @@
    buffer, or Z_DATA_ERROR if the input data was corrupted.
 */
 int uncompress (dest, destLen, source, sourceLen)
-    Byte *dest;
+    Bytef *dest;
-    uLong *destLen;
+    uLongf *destLen;
-    Byte *source;
+    Bytef *source;
     uLong sourceLen;
 {
     z_stream stream;

zconf.h

@@ -28,14 +28,24 @@
 #if defined(MSDOS) && !defined(__32BIT__)
 #  define MAXSEG_64K
 #endif
+#ifdef MSDOS
+#  define UNALIGNED_OK
+#endif
+
 #ifndef STDC
 #  if defined(MSDOS) || defined(__STDC__) || defined(__cplusplus)
 #    define STDC
 #  endif
 #endif
 
-#if !defined(STDC) && !defined(const)
+#ifndef STDC
-#  define const
+#  ifndef const
+#    define const
+#  endif
+#endif
+
+#ifdef	__MWERKS__ /* Metrowerks CodeWarrior declares fileno() in unix.h */
+#  include <unix.h>
 #endif
 
 /* Maximum value for memLevel in deflateInit2 */
@@ -67,29 +77,44 @@
 
                         /* Type declarations */
 
-#ifndef __P /* function prototypes */
+#ifndef OF /* function prototypes */
 #  ifdef STDC
-#    define __P(args)  args
+#    define OF(args)  args
 #  else
-#    define __P(args)  ()
+#    define OF(args)  ()
 #  endif
 #endif
 
-#ifndef Byte
+#if defined(M_I86SM) || defined(M_I86MM) /* model independent MSC functions */
-  typedef unsigned char  Byte;  /* 8 bits */
+#   define zstrcpy _fstrcpy
+#   define zstrcat _fstrcat
+#   define zstrlen _fstrlen
+#   define zstrcmp _fstrcmp
+#   define FAR __far
+#else
+#   define zstrcpy strcpy
+#   define zstrcat strcat
+#   define zstrlen strlen
+#   define zstrcmp strcmp
+#   define FAR
 #endif
-#ifndef uInt
+ 
-  typedef unsigned int   uInt;  /* 16 bits or more */
+typedef unsigned char  Byte;  /* 8 bits */
-#endif
+typedef unsigned int   uInt;  /* 16 bits or more */
-#ifndef uLong
+typedef unsigned long  uLong; /* 32 bits or more */
-  typedef unsigned long  uLong; /* 32 bits or more */
+
-#endif
+typedef Byte FAR Bytef;  
-#ifndef voidp
+typedef char FAR charf;  
-#  ifdef STDC
+typedef int FAR intf;
-     typedef void *voidp;
+typedef uInt FAR uIntf;
-#  else
+typedef uLong FAR uLongf;
-     typedef Byte *voidp;
+
-#  endif
+#ifdef STDC
+   typedef void FAR *voidp;
+   typedef void     *voidnp;
+#else
+   typedef Byte FAR *voidp;
+   typedef Byte     *voidnp;
 #endif
 
 #endif /* _ZCONF_H */

zlib.h

@@ -1,5 +1,5 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 0.93 June 25th, 1995.
+  version 0.94, Aug 13th, 1995.
 
   Copyright (C) 1995 Jean-loup Gailly and Mark Adler
 
@@ -28,7 +28,7 @@
 
 #include "zconf.h"
 
-#define ZLIB_VERSION "0.93"
+#define ZLIB_VERSION "0.94"
 
 /* 
      The 'zlib' compression library provides in-memory compression and
@@ -49,22 +49,22 @@
   (providing more output space) before each call.
 */
 
-typedef voidp (*alloc_func) __P((voidp opaque, uInt items, uInt size));
+typedef voidp (*alloc_func) OF((voidp opaque, uInt items, uInt size));
-typedef void  (*free_func)  __P((voidp opaque, voidp address));
+typedef void  (*free_func)  OF((voidp opaque, voidp address));
 
 struct internal_state;
 
 typedef struct z_stream_s {
-    Byte     *next_in;  /* next input byte */
+    Bytef    *next_in;  /* next input byte */
     uInt     avail_in;  /* number of bytes available at next_in */
     uLong    total_in;  /* total nb of input bytes read so far */
 
-    Byte     *next_out; /* next output byte should be put there */
+    Bytef    *next_out; /* next output byte should be put there */
     uInt     avail_out; /* remaining free space at next_out */
     uLong    total_out; /* total nb of bytes output so far */
 
     char     *msg;      /* last error message, NULL if no error */
-    struct internal_state *state; /* not visible by applications */
+    struct internal_state FAR *state; /* not visible by applications */
 
     alloc_func zalloc;  /* used to allocate the internal state */
     free_func  zfree;   /* used to free the internal state */
@@ -145,7 +145,7 @@ extern char *zlib_version;
 
                         /* basic functions */
 
-extern int deflateInit __P((z_stream *strm, int level));
+extern int deflateInit OF((z_stream *strm, int level));
 /* 
      Initializes the internal stream state for compression. The fields
    zalloc, zfree and opaque must be initialized before by the caller.
@@ -164,7 +164,7 @@ extern int deflateInit __P((z_stream *strm, int level));
 */
 
 
-extern int deflate __P((z_stream *strm, int flush));
+extern int deflate OF((z_stream *strm, int flush));
 /*
   Performs one or both of the following actions:
 
@@ -195,7 +195,10 @@ extern int deflate __P((z_stream *strm, int flush));
   is useful to allow the decompressor to synchronize if one compressed block
   has been damaged (see inflateSync below).  Flushing degrades compression and
   so should be used only when necessary.  Using Z_FULL_FLUSH too often can
-  seriously degrade the compression.
+  seriously degrade the compression. If deflate returns with avail_out == 0,
+  this function must be called again 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).
 
     If the parameter flush is set to Z_FINISH, all pending input is processed,
   all pending output is flushed and deflate returns with Z_STREAM_END if there
@@ -223,7 +226,7 @@ extern int deflate __P((z_stream *strm, int flush));
 */
 
 
-extern int deflateEnd __P((z_stream *strm));
+extern int deflateEnd OF((z_stream *strm));
 /*
      All dynamically allocated data structures for this stream are freed.
    This function discards any unprocessed input and does not flush any
@@ -235,11 +238,11 @@ extern int deflateEnd __P((z_stream *strm));
 */
 
 
-extern int inflateInit __P((z_stream *strm));
+extern int inflateInit OF((z_stream *strm));
 /* 
      Initializes the internal stream state for decompression. The fields
    zalloc and zfree must be initialized before by the caller.  If zalloc and
-   zfree are set to Z_NULL, deflateInit updates them to use default allocation
+   zfree are set to Z_NULL, inflateInit updates them to use default allocation
    functions.
 
      inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
@@ -249,7 +252,7 @@ extern int inflateInit __P((z_stream *strm));
 */
 
 
-extern int inflate __P((z_stream *strm, int flush));
+extern int inflate OF((z_stream *strm, int flush));
 /*
   Performs one or both of the following actions:
 
@@ -260,7 +263,7 @@ extern int inflate __P((z_stream *strm, int flush));
 
   - Provide more output starting at next_out and update next_out and avail_out
     accordingly.  inflate() always provides as much output as possible
-    (until no more input data or no more space in the output buffer).
+    (until there is no more input data or no more space in the output buffer).
 
   Before the call of inflate(), the application should ensure that at least
   one of the actions is possible, by providing more input and/or consuming
@@ -282,7 +285,9 @@ extern int inflate __P((z_stream *strm, int flush));
   output is flushed; avail_out must be large enough to hold all the
   uncompressed data. (The size of the uncompressed data may have been saved
   by the compressor for this purpose.) The next operation on this stream must
-  be inflateEnd to deallocate the decompression state.
+  be inflateEnd to deallocate the decompression state. The use of Z_FINISH
+  is never required, but can be used to inform inflate that a faster routine
+  may be used for the single inflate() call.
 
     inflate() returns Z_OK if some progress has been made (more input
   processed or more output produced), Z_STREAM_END if the end of the
@@ -296,7 +301,7 @@ extern int inflate __P((z_stream *strm, int flush));
 */
 
 
-extern int inflateEnd __P((z_stream *strm));
+extern int inflateEnd OF((z_stream *strm));
 /*
      All dynamically allocated data structures for this stream are freed.
    This function discards any unprocessed input and does not flush any
@@ -313,12 +318,12 @@ extern int inflateEnd __P((z_stream *strm));
     The following functions are needed only in some special applications.
 */
 
-extern int deflateInit2 __P((z_stream *strm,
+extern int deflateInit2 OF((z_stream *strm,
-                             int  level,
+                            int  level,
-                             int  method,
+                            int  method,
-                             int  windowBits,
+                            int  windowBits,
-                             int  memLevel,
+                            int  memLevel,
-                             int  strategy));
+                            int  strategy));
 /*   
      This is another version of deflateInit with more compression options. The
    fields next_in, zalloc and zfree must be initialized before by the caller.
@@ -368,8 +373,8 @@ extern int deflateInit2 __P((z_stream *strm,
    deflate().
 */
                             
-extern int deflateCopy __P((z_stream *dest,
+extern int deflateCopy OF((z_stream *dest,
-                            z_stream *source));
+                           z_stream *source));
 /*
      Sets the destination stream as a complete copy of the source stream.  If
    the source stream is using an application-supplied history buffer, a new
@@ -391,7 +396,7 @@ extern int deflateCopy __P((z_stream *dest,
    destination.
 */
 
-extern int deflateReset __P((z_stream *strm));
+extern int deflateReset OF((z_stream *strm));
 /*
      This function is equivalent to deflateEnd followed by deflateInit,
    but does not free and reallocate all the internal compression state.
@@ -402,8 +407,8 @@ extern int deflateReset __P((z_stream *strm));
    stream state was inconsistent (such as zalloc or state being NULL).
 */
 
-extern int inflateInit2 __P((z_stream *strm,
+extern int inflateInit2 OF((z_stream *strm,
-                             int  windowBits));
+                            int  windowBits));
 /*   
      This is another version of inflateInit with more compression options. The
    fields next_out, zalloc and zfree must be initialized before by the caller.
@@ -431,11 +436,11 @@ extern int inflateInit2 __P((z_stream *strm,
       inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was
    not enough memory, Z_STREAM_ERROR if a parameter is invalid (such as
    windowBits < 8). msg is set to null if there is no error message.
-   inflateInit2 does not perform any compression: this will be done by
+   inflateInit2 does not perform any decompression: this will be done by
    inflate().
 */
 
-extern int inflateSync __P((z_stream *strm));
+extern int inflateSync OF((z_stream *strm));
 /* 
     Skips invalid compressed data until the special marker (see deflate()
   above) can be found, or until all available input is skipped. No output
@@ -450,7 +455,7 @@ extern int inflateSync __P((z_stream *strm));
   until success or end of the input data.
 */
 
-extern int inflateReset __P((z_stream *strm));
+extern int inflateReset OF((z_stream *strm));
 /*
      This function is equivalent to inflateEnd followed by inflateInit,
    but does not free and reallocate all the internal decompression state.
@@ -471,8 +476,8 @@ extern int inflateReset __P((z_stream *strm));
    utility functions can easily be modified if you need special options.
 */
 
-extern int compress __P((Byte *dest,   uLong *destLen,
+extern int compress OF((Bytef *dest,   uLongf *destLen,
-                         Byte *source, uLong sourceLen));
+                        Bytef *source, uLong sourceLen));
 /*
      Compresses the source buffer into the destination buffer.  sourceLen is
    the byte length of the source buffer. Upon entry, destLen is the total
@@ -486,8 +491,8 @@ extern int compress __P((Byte *dest,   uLong *destLen,
    buffer.
 */
 
-extern int uncompress __P((Byte *dest,   uLong *destLen,
+extern int uncompress OF((Bytef *dest,   uLongf *destLen,
-                           Byte *source, uLong sourceLen));
+                          Bytef *source, uLong sourceLen));
 /*
      Decompresses the source buffer into the destination buffer.  sourceLen is
    the byte length of the source buffer. Upon entry, destLen is the total
@@ -505,21 +510,21 @@ extern int uncompress __P((Byte *dest,   uLong *destLen,
 */
 
 
-typedef voidp gzFile;
+typedef voidnp gzFile;
 
-extern gzFile gzopen  __P((char *path, char *mode));
+extern gzFile gzopen  OF((char *path, char *mode));
 /*
      Opens a gzip (.gz) file for reading or writing. The mode parameter
-   is as in fopen ("rb" or "wb"). gzopen can also be used to read a file
+   is as in fopen ("rb" or "wb") but can also include a compression level
-   which is not in gzip format; in this case gzread will directly read from
+   ("wb9").  gzopen can be used to read a file which is not in gzip format;
-   the file without decompression.
+   in this case gzread will directly read from the file without decompression.
      gzopen returns NULL if the file could not be opened or if there was
    insufficient memory to allocate the (de)compression state; errno
    can be checked to distinguish the two cases (if errno is zero, the
    zlib error is Z_MEM_ERROR).
 */
 
-extern gzFile gzdopen  __P((int fd, char *mode));
+extern gzFile gzdopen  OF((int fd, char *mode));
 /*
      gzdopen() associates a gzFile with the file descriptor fd.  File
    descriptors are obtained from calls like open, dup, creat, or pipe.
@@ -528,7 +533,7 @@ extern gzFile gzdopen  __P((int fd, char *mode));
    the (de)compression state.
 */
 
-extern int    gzread  __P((gzFile file, voidp buf, unsigned len));
+extern int    gzread  OF((gzFile file, voidnp buf, unsigned len));
 /*
      Reads the given number of uncompressed bytes from the compressed file.
    If the input file was not in gzip format, gzread copies the given number
@@ -536,14 +541,14 @@ extern int    gzread  __P((gzFile file, voidp buf, unsigned len));
      gzread returns the number of uncompressed bytes actually read (0 for
    end of file, -1 for error). */
 
-extern int    gzwrite __P((gzFile file, voidp buf, unsigned len));
+extern int    gzwrite OF((gzFile file, voidnp buf, unsigned len));
 /*
      Writes the given number of uncompressed bytes into the compressed file.
    gzwrite returns the number of uncompressed bytes actually written
    (0 in case of error).
 */
 
-extern int    gzflush __P((gzFile file, int flush));
+extern int    gzflush OF((gzFile file, int flush));
 /*
      Flushes all pending output into the compressed file. The parameter
    flush is as in the deflate() function. The return value is the zlib
@@ -553,14 +558,14 @@ extern int    gzflush __P((gzFile file, int flush));
    degrade compression.
 */
 
-extern int    gzclose __P((gzFile file));
+extern int    gzclose OF((gzFile file));
 /*
      Flushes all pending output if necessary, closes the compressed file
    and deallocates all the (de)compression state. The return value is the zlib
    error number (see function gzerror below).
 */
 
-extern char*   gzerror __P((gzFile file, int *errnum));
+extern char*   gzerror OF((gzFile file, int *errnum));
 /*
      Returns the error message for the last error which occurred on the
    given compressed file. errnum is set to zlib error number. If an
@@ -577,7 +582,8 @@ extern char*   gzerror __P((gzFile file, int *errnum));
    compression library.
 */
 
-extern uLong adler32 __P((uLong adler, Byte *buf, uInt len));
+extern uLong adler32 OF((uLong adler, Bytef *buf, uInt len));
+
 /*
      Update a running Adler-32 checksum with the bytes buf[0..len-1] and
    return the updated checksum. If buf is NULL, this function returns
@@ -593,7 +599,7 @@ extern uLong adler32 __P((uLong adler, Byte *buf, uInt len));
      if (adler != original_adler) error();
 */
 
-extern uLong crc32   __P((uLong crc, Byte *buf, uInt len));
+extern uLong crc32   OF((uLong crc, Bytef *buf, uInt len));
 /*
      Update a running crc with the bytes buf[0..len-1] and return the updated
    crc. If buf is NULL, this function returns the required initial value

zutil.c

@@ -9,8 +9,10 @@
 
 #include "zutil.h"
 
+struct internal_state      {int dummy;}; /* for buggy compilers */
+
 #ifndef __GO32__
-extern void exit __P((int));
+extern void exit OF((int));
 #endif
 
 char *zlib_version = ZLIB_VERSION;
@@ -129,7 +131,7 @@ void  zcfree (voidp opaque, voidp ptr)
 }
 #endif /* __TURBOC__ */
 
-#if defined(M_I86CM) || defined(M_I86LM) /* MSC compact or large model */
+#if defined(MSDOS) && !defined(__TURBOC__)  /* MSC */
 
 #  define MY_ZCALLOC
 
@@ -150,14 +152,14 @@ void  zcfree (voidp opaque, voidp ptr)
     _hfree(ptr);
 }
 
-#endif /* defined(M_I86CM) || defined(M_I86LM) */
+#endif /* MSC */
 
 
 #ifndef MY_ZCALLOC /* Any system without a special alloc function */
 
 #ifndef __GO32__
-extern voidp calloc __P((uInt items, uInt size));
+extern voidp calloc OF((uInt items, uInt size));
-extern void  free   __P((voidp ptr));
+extern void  free   OF((voidp ptr));
 #endif
 
 voidp zcalloc (opaque, items, size)

zutil.h

@@ -15,11 +15,7 @@
 
 #include "zlib.h"
 
-/* #ifndef __GNUC__   disable inline for now */
+#if defined(MSDOS) || defined(VMS)
-#  define inline
-/* #endif */
-
-#ifdef MSDOS
 #   include <stddef.h>
 #   include <errno.h>
 #else
@@ -35,7 +31,9 @@
 /* compile with -Dlocal if your debugger can't find static symbols */
 
 typedef unsigned char  uch;
+typedef uch FAR uchf;
 typedef unsigned short ush;
+typedef ush FAR ushf;
 typedef unsigned long  ulg;
 
 extern char *z_errmsg[]; /* indexed by 1-zlib_error */
@@ -47,7 +45,9 @@ extern char *z_errmsg[]; /* indexed by 1-zlib_error */
 
 #define DEFLATED   8
 
-#define DEF_WBITS 15
+#ifndef DEF_WBITS
+#  define DEF_WBITS 15
+#endif
 /* default windowBits for decompression. MAX_WBITS is for compression only */
 
 #if MAX_MEM_LEVEL >= 8
@@ -124,7 +124,7 @@ extern char *z_errmsg[]; /* indexed by 1-zlib_error */
          /* functions */
 
 #ifdef HAVE_STRERROR
-   extern char *strerror __P((int));
+   extern char *strerror OF((int));
 #  define zstrerror(errnum) strerror(errnum)
 #else
 #  define zstrerror(errnum) ""
@@ -137,11 +137,16 @@ extern char *z_errmsg[]; /* indexed by 1-zlib_error */
 #  define HAVE_MEMCPY
 #endif
 #ifdef HAVE_MEMCPY
-#  define zmemcpy memcpy
+#  ifdef M_I86MM /* MSC medium model */
-#  define zmemzero(dest, len) memset(dest, 0, len)
+#    define zmemcpy _fmemcpy
+#    define zmemzero(dest, len) _fmemset(dest, 0, len)
+#  else 
+#    define zmemcpy memcpy
+#    define zmemzero(dest, len) memset(dest, 0, len)
+#  endif
 #else
-   extern void zmemcpy  __P((Byte* dest, Byte* source, uInt len));
+   extern void zmemcpy  OF((Byte* dest, Byte* source, uInt len));
-   extern void zmemzero __P((Byte* dest, uInt len));
+   extern void zmemzero OF((Byte* dest, uInt len));
 #endif
 
 /* Diagnostic functions */
@@ -166,12 +171,12 @@ extern char *z_errmsg[]; /* indexed by 1-zlib_error */
 #endif
 
 
-typedef uLong (*check_func) __P((uLong check, Byte *buf, uInt len));
+typedef uLong (*check_func) OF((uLong check, Bytef *buf, uInt len));
 
-extern void z_error    __P((char *m));
+extern void z_error    OF((char *m));
 
-voidp zcalloc __P((voidp opaque, unsigned items, unsigned size));
+voidp zcalloc OF((voidp opaque, unsigned items, unsigned size));
-void  zcfree  __P((voidp opaque, voidp ptr));
+void  zcfree  OF((voidp opaque, voidp ptr));
 
 #define ZALLOC(strm, items, size) \
            (*((strm)->zalloc))((strm)->opaque, (items), (size))