diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-08-19 14:54:30 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-08-19 14:54:30 +1000 |
| commit | 5631ebaf78fee35880aafe29578b8925c655e5f4 (patch) | |
| tree | 8a9bceb40f3f4839dc1cc8a5ac38982536911d7f /source4/lib/zlib/inffast.c | |
| parent | fe95409de76cf64bb65dbc9ce1ed2ddf9774a896 (diff) | |
| parent | b33f4541f6157163f9b22af8607ecefe3953638f (diff) | |
| download | samba-5631ebaf78fee35880aafe29578b8925c655e5f4.tar.gz samba-5631ebaf78fee35880aafe29578b8925c655e5f4.tar.xz samba-5631ebaf78fee35880aafe29578b8925c655e5f4.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit a6146cc14ba950b1911094b1525c7d06b50ecec6)
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 bbee92ed1e6..bfc727694a9 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; } |