Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a20c2fa authored by Corentin Labbe's avatar Corentin Labbe Committed by Linus Torvalds
Browse files

lib/zlib_inflate/inflate.c: remove fall through warnings 

This patch remove all following fall through warnings by
adding /* fall through */ markers.
Note that we cannot add "__attribute__ ((fallthrough));" due to it is GCC7 only
arch/arm/boot/compressed/../../../../lib/zlib_inflate/inflate.c:384:25: warning: this statement may fall through [-Wimplicit-fallthrough=]
arch/arm/boot/compressed/../../../../lib/zlib_inflate/inflate.c:391:25: warning: this statement may fall through [-Wimplicit-fallthrough=]
arch/arm/boot/compressed/../../../../lib/zlib_inflate/inflate.c:393:16: warning: this statement may fall through [-Wimplicit-fallthrough=]
arch/arm/boot/compressed/../../../../lib/zlib_inflate/inflate.c:430:25: warning: this statement may fall through [-Wimplicit-fallthrough=]
arch/arm/boot/compressed/../../../../lib/zlib_inflate/inflate.c:556:25: warning: this statement may fall through [-Wimplicit-fallthrough=]
arch/arm/boot/compressed/../../../../lib/zlib_inflate/inflate.c:595:25: warning: this statement may fall through [-Wimplicit-fallthrough=]
arch/arm/boot/compressed/../../../../lib/zlib_inflate/inflate.c:602:25: warning: this statement may fall through [-Wimplicit-fallthrough=]
arch/arm/boot/compressed/../../../../lib/zlib_inflate/inflate.c:627:25: warning: this statement may fall through [-Wimplicit-fallthrough=]
arch/arm/boot/compressed/../../../../lib/zlib_inflate/inflate.c:646:25: warning: this statement may fall through [-Wimplicit-fallthrough=]
arch/arm/boot/compressed/../../../../lib/zlib_inflate/inflate.c:696:25: warning: this statement may fall through [-Wimplicit-fallthrough=]

It is easy to see that thoses fall through are needed since in each case state->mode are set to the case value just below.

Link: http://lkml.kernel.org/r/1536215920-19955-1-git-send-email-clabbe@baylibre.com


Signed-off-by: default avatarCorentin Labbe <clabbe@baylibre.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 36c8d1e7

lib/zlib_inflate/inflate.c

+12 −0
Original line number Diff line number Diff line
@@ -382,6 +382,7 @@ int zlib_inflate(z_streamp strm, int flush) 
            strm->adler = state->check = REVERSE(hold);

            INITBITS();

            state->mode = DICT;

	    /* fall through */

        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;

	    /* fall through */

        case TYPE:

            if (flush == Z_BLOCK) goto inf_leave;

	    /* fall through */

        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;

	    /* fall through */

        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;

	    /* fall through */

        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;

	    /* fall through */

        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;

	    /* fall through */

        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;

	    /* fall through */

        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;

	    /* fall through */

        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;

	    /* fall through */

        case DISTEXT:

            if (state->extra) {

                NEEDBITS(state->extra);
@@ -644,6 +654,7 @@ int zlib_inflate(z_streamp strm, int flush) 
                break;

            }

            state->mode = MATCH;

	    /* fall through */

        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;

	    /* fall through */

        case DONE:

            ret = Z_STREAM_END;

            goto inf_leave;