summaryrefslogtreecommitdiff
path: root/zlib/inflate.c
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2020-01-29 16:41:04 +0200
committerMonty <monty@mariadb.org>2020-01-29 23:23:55 +0200
commit4d61f1247a1b6a86570cb03d3450930a78d689b3 (patch)
treee7b98495425ae73591c8c1f3cf81793196aca3ea /zlib/inflate.c
parentcd2c0e013ccb5f9b009743dfd7188585a539d9b5 (diff)
downloadmariadb-git-4d61f1247a1b6a86570cb03d3450930a78d689b3.tar.gz
Fixed compiler warnings from gcc 7.4.1
- Fixed possible error in rocksdb/rdb_datadic.cc
Diffstat (limited to 'zlib/inflate.c')
-rw-r--r--zlib/inflate.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/zlib/inflate.c b/zlib/inflate.c
index ac333e8c2ed..c10064c7ee2 100644
--- a/zlib/inflate.c
+++ b/zlib/inflate.c
@@ -740,6 +740,7 @@ int flush;
CRC2(state->check, hold);
INITBITS();
state->mode = EXLEN;
+ /* falls through */
case EXLEN:
if (state->flags & 0x0400) {
NEEDBITS(16);
@@ -753,6 +754,7 @@ int flush;
else if (state->head != Z_NULL)
state->head->extra = Z_NULL;
state->mode = EXTRA;
+ /* falls through */
case EXTRA:
if (state->flags & 0x0400) {
copy = state->length;
@@ -775,6 +777,7 @@ int flush;
}
state->length = 0;
state->mode = NAME;
+ /* falls through */
case NAME:
if (state->flags & 0x0800) {
if (have == 0) goto inf_leave;
@@ -796,6 +799,7 @@ int flush;
state->head->name = Z_NULL;
state->length = 0;
state->mode = COMMENT;
+ /* falls through */
case COMMENT:
if (state->flags & 0x1000) {
if (have == 0) goto inf_leave;
@@ -816,6 +820,7 @@ int flush;
else if (state->head != Z_NULL)
state->head->comment = Z_NULL;
state->mode = HCRC;
+ /* falls through */
case HCRC:
if (state->flags & 0x0200) {
NEEDBITS(16);
@@ -839,6 +844,7 @@ int flush;
strm->adler = state->check = ZSWAP32(hold);
INITBITS();
state->mode = DICT;
+ /* falls through */
case DICT:
if (state->havedict == 0) {
RESTORE();
@@ -846,8 +852,10 @@ int flush;
}
strm->adler = state->check = adler32(0L, Z_NULL, 0);
state->mode = TYPE;
+ /* falls through */
case TYPE:
if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave;
+ /* falls through */
case TYPEDO:
if (state->last) {
BYTEBITS();
@@ -898,8 +906,10 @@ int flush;
INITBITS();
state->mode = COPY_;
if (flush == Z_TREES) goto inf_leave;
+ /* falls through */
case COPY_:
state->mode = COPY;
+ /* falls through */
case COPY:
copy = state->length;
if (copy) {
@@ -1039,8 +1049,10 @@ int flush;
Tracev((stderr, "inflate: codes ok\n"));
state->mode = LEN_;
if (flush == Z_TREES) goto inf_leave;
+ /* falls through */
case LEN_:
state->mode = LEN;
+ /* falls through */
case LEN:
if (have >= 6 && left >= 258) {
RESTORE();
@@ -1090,6 +1102,7 @@ int flush;
}
state->extra = (unsigned)(here.op) & 15;
state->mode = LENEXT;
+ /* falls through */
case LENEXT:
if (state->extra) {
NEEDBITS(state->extra);
@@ -1100,6 +1113,7 @@ int flush;
Tracevv((stderr, "inflate: length %u\n", state->length));
state->was = state->length;
state->mode = DIST;
+ /* falls through */
case DIST:
for (;;) {
here = state->distcode[BITS(state->distbits)];
@@ -1127,6 +1141,7 @@ int flush;
state->offset = (unsigned)here.val;
state->extra = (unsigned)(here.op) & 15;
state->mode = DISTEXT;
+ /* falls through */
case DISTEXT:
if (state->extra) {
NEEDBITS(state->extra);
@@ -1143,6 +1158,7 @@ int flush;
#endif
Tracevv((stderr, "inflate: distance %u\n", state->offset));
state->mode = MATCH;
+ /* falls through */
case MATCH:
if (left == 0) goto inf_leave;
copy = out - left;
@@ -1218,6 +1234,7 @@ int flush;
}
#ifdef GUNZIP
state->mode = LENGTH;
+ /* falls through */
case LENGTH:
if (state->wrap && state->flags) {
NEEDBITS(32);
@@ -1231,6 +1248,7 @@ int flush;
}
#endif
state->mode = DONE;
+ /* falls through */
case DONE:
ret = Z_STREAM_END;
goto inf_leave;