diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:23:14 -0700 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:23:14 -0700 |
| commit | a2506218cd8c32416d0d15260834f3c23d910fc8 (patch) | |
| tree | 25bbd63d92473c8ae02a27cce3fc7c04a6aba64a /inflate.c | |
| parent | b97ec631c6f7dd9cff2e3caf3b38e70b006e1b2d (diff) | |
| download | zlib-a2506218cd8c32416d0d15260834f3c23d910fc8.tar.gz zlib-a2506218cd8c32416d0d15260834f3c23d910fc8.tar.bz2 zlib-a2506218cd8c32416d0d15260834f3c23d910fc8.zip | |
zlib 1.2.0.8v1.2.0.8
Diffstat (limited to 'inflate.c')
| -rw-r--r-- | inflate.c | 6 |
1 files changed, 3 insertions, 3 deletions
| @@ -568,7 +568,7 @@ int flush; | |||
| 568 | switch (state->mode) { | 568 | switch (state->mode) { |
| 569 | case HEAD: | 569 | case HEAD: |
| 570 | if (state->wrap == 0) { | 570 | if (state->wrap == 0) { |
| 571 | state->mode = TYPE; | 571 | state->mode = TYPEDO; |
| 572 | break; | 572 | break; |
| 573 | } | 573 | } |
| 574 | NEEDBITS(16); | 574 | NEEDBITS(16); |
| @@ -1074,8 +1074,8 @@ int flush; | |||
| 1074 | if (state->wrap && out) | 1074 | if (state->wrap && out) |
| 1075 | strm->adler = state->check = | 1075 | strm->adler = state->check = |
| 1076 | UPDATE(state->check, strm->next_out - out, out); | 1076 | UPDATE(state->check, strm->next_out - out, out); |
| 1077 | strm->data_type = state->bits + (state->last ? 8 : 0) + | 1077 | strm->data_type = state->bits + (state->last ? 64 : 0) + |
| 1078 | (state->mode == TYPE ? 16 : 0); | 1078 | (state->mode == TYPE ? 128 : 0); |
| 1079 | if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK) | 1079 | if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK) |
| 1080 | ret = Z_BUF_ERROR; | 1080 | ret = Z_BUF_ERROR; |
| 1081 | return ret; | 1081 | return ret; |