summaryrefslogtreecommitdiff
path: root/sys/lib/libz/inftrees.c
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2002-03-12 00:26:31 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2002-03-12 00:26:31 +0000
commit09d05ff04856fed02e2cfa9a8a8b72e1074a59b4 (patch)
tree4e0612ba554b903b35e1a3ec5b9e97c8b1c04fe2 /sys/lib/libz/inftrees.c
parent1e1ccbf8f1be5a063a5e89a8019bbc6bb12c5fb1 (diff)
Update to zlib-1.1.4
Diffstat (limited to 'sys/lib/libz/inftrees.c')
-rw-r--r--sys/lib/libz/inftrees.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/lib/libz/inftrees.c b/sys/lib/libz/inftrees.c
index ef1e0b6b873..3c40bc26b9a 100644
--- a/sys/lib/libz/inftrees.c
+++ b/sys/lib/libz/inftrees.c
@@ -1,5 +1,6 @@
+/* $OpenBSD: inftrees.c,v 1.9 2002/03/12 00:26:30 millert Exp $ */
/* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-1998 Mark Adler
+ * Copyright (C) 1995-2002 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -11,7 +12,7 @@
#endif
const char inflate_copyright[] =
- " inflate 1.1.3 Copyright 1995-1998 Mark Adler ";
+ " inflate 1.1.4 Copyright 1995-2002 Mark Adler ";
/*
If you use the zlib library in a product, an acknowledgment is welcome
in the documentation of your product. If for some reason you cannot
@@ -104,8 +105,7 @@ uIntf *v; /* working area: values in order of bit length */
/* 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
if the given code set is incomplete (the tables are still built in this
- case), Z_DATA_ERROR if the input is invalid (an over-subscribed set of
- lengths), or Z_MEM_ERROR if not enough memory. */
+ case), or Z_DATA_ERROR if the input is invalid. */
{
uInt a; /* counter for codes of length k */
@@ -231,7 +231,7 @@ uIntf *v; /* working area: values in order of bit length */
/* allocate new table */
if (*hn + z > MANY) /* (note: doesn't matter for fixed) */
- return Z_MEM_ERROR; /* not enough memory */
+ return Z_DATA_ERROR; /* overflow of MANY */
u[h] = q = hp + *hn;
*hn += z;