diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:11:37 -0700 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:11:37 -0700 |
commit | 56bcb184fac036a45cb8937238d51778d0a796aa (patch) | |
tree | 7b127418b30e135f8ce27ec136038b5090540820 /inffast.c | |
parent | 25e5325501edade156e897f95afdaa2be78ad9a3 (diff) | |
download | zlib-56bcb184fac036a45cb8937238d51778d0a796aa.tar.gz |
zlib 0.99v0.99
Diffstat (limited to 'inffast.c')
-rw-r--r-- | inffast.c | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -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; { @@ -102,7 +103,7 @@ z_stream *z; } else /* else offset after destination */ { - e = d - (q - s->window); /* bytes from offset to end */ + e = d - (uInt)(q - s->window); /* bytes from offset to end */ r = s->end - e; /* pointer to offset */ if (c > e) /* if source crosses, */ { @@ -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; |