[src/netbsd-1-5]: src/sys/lib/libz Pull up revision 1.10 (requested by fvdl):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f902be6661c7
branches:  netbsd-1-5
changeset: 492973:f902be6661c7
user:      he <he%NetBSD.org@localhost>
date:      Wed Mar 20 23:18:29 2002 +0000

description:
Pull up revision 1.10 (requested by fvdl):
  Upgrade libz to 1.1.4 due to a possible security bug.

diffstat:

 sys/lib/libz/zutil.h |  22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diffs (66 lines):

diff -r 038d5aff7d29 -r f902be6661c7 sys/lib/libz/zutil.h
--- a/sys/lib/libz/zutil.h      Wed Mar 20 23:18:26 2002 +0000
+++ b/sys/lib/libz/zutil.h      Wed Mar 20 23:18:29 2002 +0000
@@ -1,7 +1,7 @@
-/* $NetBSD: zutil.h,v 1.9 1999/11/13 21:24:20 thorpej Exp $ */
+/* $NetBSD: zutil.h,v 1.9.4.1 2002/03/20 23:18:29 he Exp $ */
 
 /* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-1998 Jean-loup Gailly.
+ * Copyright (C) 1995-2002 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -10,7 +10,7 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* @(#) Id */
+/* @(#) $Id: zutil.h,v 1.9.4.1 2002/03/20 23:18:29 he Exp $ */
 
 #ifndef _Z_UTIL_H
 #define _Z_UTIL_H
@@ -160,7 +160,7 @@
          /* functions */
 
 #ifdef HAVE_STRERROR
-   extern char *strerror OF((int));
+   extern char *strerror __P((int));
 #  define zstrerror(errnum) strerror(errnum)
 #else
 #  define zstrerror(errnum) ""
@@ -190,16 +190,16 @@
 #    define zmemzero(dest, len) memset(dest, 0, len)
 #  endif
 #else
-   extern void zmemcpy  OF((Bytef* dest, const Bytef* source, uInt len));
-   extern int  zmemcmp  OF((const Bytef* s1, const Bytef* s2, uInt len));
-   extern void zmemzero OF((Bytef* dest, uInt len));
+   extern void zmemcpy  __P((Bytef* dest, const Bytef* source, uInt len));
+   extern int  zmemcmp  __P((const Bytef* s1, const Bytef* s2, uInt len));
+   extern void zmemzero __P((Bytef* dest, uInt len));
 #endif
 
 /* Diagnostic functions */
 #if defined(DEBUG) && !defined(_KERNEL) && !defined(_STANDALONE)
 #  include <stdio.h>
    extern int z_verbose;
-   extern void z_error    OF((char *m));
+   extern void z_error    __P((char *m));
 #  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
 #  define Trace(x) {if (z_verbose>=0) fprintf x ;}
 #  define Tracev(x) {if (z_verbose>0) fprintf x ;}
@@ -216,10 +216,10 @@
 #endif
 
 
-typedef uLong (ZEXPORT *check_func) OF((uLong check, const Bytef *buf,
+typedef uLong (ZEXPORT *check_func) __P((uLong check, const Bytef *buf,
                                       uInt len));
-voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
-void   zcfree  OF((voidpf opaque, voidpf ptr));
+voidpf zcalloc __P((voidpf opaque, unsigned items, unsigned size));
+void   zcfree  __P((voidpf opaque, voidpf ptr));
 
 #define ZALLOC(strm, items, size) \
            (*((strm)->zalloc))((strm)->opaque, (items), (size))