projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'work.afs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-microblaze.git]
/
lib
/
zlib_inflate
/
inflate.c
diff --git
a/lib/zlib_inflate/inflate.c
b/lib/zlib_inflate/inflate.c
index
58a733b
..
48f14cd
100644
(file)
--- a/
lib/zlib_inflate/inflate.c
+++ b/
lib/zlib_inflate/inflate.c
@@
-382,6
+382,7
@@
int zlib_inflate(z_streamp strm, int flush)
strm->adler = state->check = REVERSE(hold);
INITBITS();
state->mode = DICT;
strm->adler = state->check = REVERSE(hold);
INITBITS();
state->mode = DICT;
+ /* fall through */
case DICT:
if (state->havedict == 0) {
RESTORE();
case DICT:
if (state->havedict == 0) {
RESTORE();
@@
-389,8
+390,10
@@
int zlib_inflate(z_streamp strm, int flush)
}
strm->adler = state->check = zlib_adler32(0L, NULL, 0);
state->mode = TYPE;
}
strm->adler = state->check = zlib_adler32(0L, NULL, 0);
state->mode = TYPE;
+ /* fall through */
case TYPE:
if (flush == Z_BLOCK) goto inf_leave;
case TYPE:
if (flush == Z_BLOCK) goto inf_leave;
+ /* fall through */
case TYPEDO:
if (state->last) {
BYTEBITS();
case TYPEDO:
if (state->last) {
BYTEBITS();
@@
-428,6
+431,7
@@
int zlib_inflate(z_streamp strm, int flush)
state->length = (unsigned)hold & 0xffff;
INITBITS();
state->mode = COPY;
state->length = (unsigned)hold & 0xffff;
INITBITS();
state->mode = COPY;
+ /* fall through */
case COPY:
copy = state->length;
if (copy) {
case COPY:
copy = state->length;
if (copy) {
@@
-461,6
+465,7
@@
int zlib_inflate(z_streamp strm, int flush)
#endif
state->have = 0;
state->mode = LENLENS;
#endif
state->have = 0;
state->mode = LENLENS;
+ /* fall through */
case LENLENS:
while (state->have < state->ncode) {
NEEDBITS(3);
case LENLENS:
while (state->have < state->ncode) {
NEEDBITS(3);
@@
-481,6
+486,7
@@
int zlib_inflate(z_streamp strm, int flush)
}
state->have = 0;
state->mode = CODELENS;
}
state->have = 0;
state->mode = CODELENS;
+ /* fall through */
case CODELENS:
while (state->have < state->nlen + state->ndist) {
for (;;) {
case CODELENS:
while (state->have < state->nlen + state->ndist) {
for (;;) {
@@
-554,6
+560,7
@@
int zlib_inflate(z_streamp strm, int flush)
break;
}
state->mode = LEN;
break;
}
state->mode = LEN;
+ /* fall through */
case LEN:
if (have >= 6 && left >= 258) {
RESTORE();
case LEN:
if (have >= 6 && left >= 258) {
RESTORE();
@@
-593,6
+600,7
@@
int zlib_inflate(z_streamp strm, int flush)
}
state->extra = (unsigned)(this.op) & 15;
state->mode = LENEXT;
}
state->extra = (unsigned)(this.op) & 15;
state->mode = LENEXT;
+ /* fall through */
case LENEXT:
if (state->extra) {
NEEDBITS(state->extra);
case LENEXT:
if (state->extra) {
NEEDBITS(state->extra);
@@
-600,6
+608,7
@@
int zlib_inflate(z_streamp strm, int flush)
DROPBITS(state->extra);
}
state->mode = DIST;
DROPBITS(state->extra);
}
state->mode = DIST;
+ /* fall through */
case DIST:
for (;;) {
this = state->distcode[BITS(state->distbits)];
case DIST:
for (;;) {
this = state->distcode[BITS(state->distbits)];
@@
-625,6
+634,7
@@
int zlib_inflate(z_streamp strm, int flush)
state->offset = (unsigned)this.val;
state->extra = (unsigned)(this.op) & 15;
state->mode = DISTEXT;
state->offset = (unsigned)this.val;
state->extra = (unsigned)(this.op) & 15;
state->mode = DISTEXT;
+ /* fall through */
case DISTEXT:
if (state->extra) {
NEEDBITS(state->extra);
case DISTEXT:
if (state->extra) {
NEEDBITS(state->extra);
@@
-644,6
+654,7
@@
int zlib_inflate(z_streamp strm, int flush)
break;
}
state->mode = MATCH;
break;
}
state->mode = MATCH;
+ /* fall through */
case MATCH:
if (left == 0) goto inf_leave;
copy = out - left;
case MATCH:
if (left == 0) goto inf_leave;
copy = out - left;
@@
-694,6
+705,7
@@
int zlib_inflate(z_streamp strm, int flush)
INITBITS();
}
state->mode = DONE;
INITBITS();
}
state->mode = DONE;
+ /* fall through */
case DONE:
ret = Z_STREAM_END;
goto inf_leave;
case DONE:
ret = Z_STREAM_END;
goto inf_leave;