diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-08-19 14:10:53 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-08-19 14:10:53 +1000 |
| commit | aef684da3149eaf2b8d87c4903af241c9a2311a6 (patch) | |
| tree | 5b383bca4046f59b243293e721b730f860fb86ec /source4/lib/zlib/inffast.c | |
| parent | 47d80366bef5e62b6727a574b2300cc94a2e18f7 (diff) | |
| parent | 4422617f7a5c36740263397b1672f75efe879520 (diff) | |
| download | samba-aef684da3149eaf2b8d87c4903af241c9a2311a6.tar.gz samba-aef684da3149eaf2b8d87c4903af241c9a2311a6.tar.bz2 samba-aef684da3149eaf2b8d87c4903af241c9a2311a6.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 27d07df301d60e49d36efd003f2fd2305c83c3fe)
Diffstat (limited to 'source4/lib/zlib/inffast.c')
| -rw-r--r-- | source4/lib/zlib/inffast.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/lib/zlib/inffast.c b/source4/lib/zlib/inffast.c index bbee92ed1e..bfc727694a 100644 --- a/source4/lib/zlib/inffast.c +++ b/source4/lib/zlib/inffast.c @@ -69,8 +69,8 @@ z_streamp strm; unsigned start; /* inflate()'s starting value for strm->avail_out */ { struct inflate_state FAR *state; - unsigned char FAR *in; /* local strm->next_in */ - unsigned char FAR *last; /* while in < last, enough input available */ + unsigned const char FAR *in; /* local strm->next_in */ + unsigned const char FAR *last; /* while in < last, enough input available */ unsigned char FAR *out; /* local strm->next_out */ unsigned char FAR *beg; /* inflate()'s initial strm->next_out */ unsigned char FAR *end; /* while out < end, enough space available */ @@ -187,7 +187,7 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ if (dist > op) { /* see if copy from window */ op = dist - op; /* distance back in window */ if (op > whave) { - strm->msg = (char *)"invalid distance too far back"; + strm->msg = "invalid distance too far back"; state->mode = BAD; break; } @@ -263,7 +263,7 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ goto dodist; } else { - strm->msg = (char *)"invalid distance code"; + strm->msg = "invalid distance code"; state->mode = BAD; break; } @@ -278,7 +278,7 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ break; } else { - strm->msg = (char *)"invalid literal/length code"; + strm->msg = "invalid literal/length code"; state->mode = BAD; break; } |