[PATCH-for-4.1?,1/7] json: Move switch 'fall through' comment to correct place
diff mbox series

Message ID 20190719131425.10835-2-philmd@redhat.com
State New
Headers show
Series
  • Trivial switch 'fall through' comment fixes for GCC9
Related show

Commit Message

Philippe Mathieu-Daudé July 19, 2019, 1:14 p.m. UTC
Reported by GCC9 when building with CFLAG -Wimplicit-fallthrough=2:

  qobject/json-parser.c: In function ‘parse_literal’:
  qobject/json-parser.c:492:24: error: this statement may fall through [-Werror=implicit-fallthrough=]
    492 |     case JSON_INTEGER: {
        |                        ^
  qobject/json-parser.c:524:5: note: here
    524 |     case JSON_FLOAT:
        |     ^~~~

Correctly place the 'fall through' comment.

Reported-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 qobject/json-parser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Eric Blake July 19, 2019, 3:31 p.m. UTC | #1
On 7/19/19 8:14 AM, Philippe Mathieu-Daudé wrote:
> Reported by GCC9 when building with CFLAG -Wimplicit-fallthrough=2:
> 
>   qobject/json-parser.c: In function ‘parse_literal’:
>   qobject/json-parser.c:492:24: error: this statement may fall through [-Werror=implicit-fallthrough=]
>     492 |     case JSON_INTEGER: {
>         |                        ^
>   qobject/json-parser.c:524:5: note: here
>     524 |     case JSON_FLOAT:
>         |     ^~~~
> 
> Correctly place the 'fall through' comment.
> 
> Reported-by: Stefan Weil <sw@weilnetz.de>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  qobject/json-parser.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Eric Blake <eblake@redhat.com>
Laurent Vivier Aug. 21, 2019, 8:54 a.m. UTC | #2
Le 19/07/2019 à 15:14, Philippe Mathieu-Daudé a écrit :
> Reported by GCC9 when building with CFLAG -Wimplicit-fallthrough=2:
> 
>   qobject/json-parser.c: In function ‘parse_literal’:
>   qobject/json-parser.c:492:24: error: this statement may fall through [-Werror=implicit-fallthrough=]
>     492 |     case JSON_INTEGER: {
>         |                        ^
>   qobject/json-parser.c:524:5: note: here
>     524 |     case JSON_FLOAT:
>         |     ^~~~
> 
> Correctly place the 'fall through' comment.
> 
> Reported-by: Stefan Weil <sw@weilnetz.de>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  qobject/json-parser.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/qobject/json-parser.c b/qobject/json-parser.c
> index 7d23e12e33..d083810d37 100644
> --- a/qobject/json-parser.c
> +++ b/qobject/json-parser.c
> @@ -519,8 +519,8 @@ static QObject *parse_literal(JSONParserContext *ctxt)
>              }
>              assert(ret == -ERANGE);
>          }
> -        /* fall through to JSON_FLOAT */
>      }
> +    /* fall through to JSON_FLOAT */
>      case JSON_FLOAT:
>          /* FIXME dependent on locale; a pervasive issue in QEMU */
>          /* FIXME our lexer matches RFC 8259 in forbidding Inf or NaN,
> 

Applied to my trivial-patches branch.

Thanks,
Laurent

Patch
diff mbox series

diff --git a/qobject/json-parser.c b/qobject/json-parser.c
index 7d23e12e33..d083810d37 100644
--- a/qobject/json-parser.c
+++ b/qobject/json-parser.c
@@ -519,8 +519,8 @@  static QObject *parse_literal(JSONParserContext *ctxt)
             }
             assert(ret == -ERANGE);
         }
-        /* fall through to JSON_FLOAT */
     }
+    /* fall through to JSON_FLOAT */
     case JSON_FLOAT:
         /* FIXME dependent on locale; a pervasive issue in QEMU */
         /* FIXME our lexer matches RFC 8259 in forbidding Inf or NaN,