summaryrefslogtreecommitdiff
path: root/inffast.c
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2011-09-09 23:14:39 -0700
committerMark Adler <madler@alumni.caltech.edu>2011-09-09 23:14:39 -0700
commit423eb40306489f9c88f7dba32c2f69179166730b (patch)
treeb5a83b0b1e52bbe0de973dcbc7ec008c1d7cf7d9 /inffast.c
parent8a2acbffc86012de3523ecf91db2c4ea1b1c4ea2 (diff)
downloadzlib-423eb40306489f9c88f7dba32c2f69179166730b.tar.gz
zlib 1.0.1v1.0.1
Diffstat (limited to 'inffast.c')
-rw-r--r--inffast.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/inffast.c b/inffast.c
index 64c6289..209c0ee 100644
--- a/inffast.c
+++ b/inffast.c
@@ -1,5 +1,5 @@
/* inffast.c -- process literals and length/distance pairs fast
- * Copyright (C) 1995 Mark Adler
+ * Copyright (C) 1995-1996 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -29,7 +29,8 @@ 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;
+inflate_huft *tl;
+inflate_huft *td; /* need separate declaration for Borland C++ */
inflate_blocks_statef *s;
z_stream *z;
{
@@ -122,7 +123,7 @@ z_stream *z;
e = (t = t->next + ((uInt)b & inflate_mask[e]))->exop;
else
{
- z->msg = "invalid distance code";
+ z->msg = (char*)"invalid distance code";
UNGRAB
UPDATE
return Z_DATA_ERROR;
@@ -152,7 +153,7 @@ z_stream *z;
}
else
{
- z->msg = "invalid literal/length code";
+ z->msg = (char*)"invalid literal/length code";
UNGRAB
UPDATE
return Z_DATA_ERROR;