summaryrefslogtreecommitdiffstats
path: root/lib/libz/inftrees.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libz/inftrees.c')
-rw-r--r--lib/libz/inftrees.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/libz/inftrees.c b/lib/libz/inftrees.c
index 4c32ca3..9ed0316 100644
--- a/lib/libz/inftrees.c
+++ b/lib/libz/inftrees.c
@@ -1,8 +1,11 @@
/* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2002 Mark Adler
+ * Copyright (C) 1995-1998 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "zutil.h"
#include "inftrees.h"
@@ -11,7 +14,7 @@
#endif
const char inflate_copyright[] =
- " inflate 1.1.4 Copyright 1995-2002 Mark Adler ";
+ " inflate 1.1.3 Copyright 1995-1998 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,7 +107,8 @@ 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), or Z_DATA_ERROR if the input is invalid. */
+ case), Z_DATA_ERROR if the input is invalid (an over-subscribed set of
+ lengths), or Z_MEM_ERROR if not enough memory. */
{
uInt a; /* counter for codes of length k */
@@ -230,7 +234,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_DATA_ERROR; /* overflow of MANY */
+ return Z_MEM_ERROR; /* not enough memory */
u[h] = q = hp + *hn;
*hn += z;
OpenPOWER on IntegriCloud