In preparation of raising -Wimplicit-fallthrough to 5, replace all fall-through comments with the fallthrough attribute pseudo-keyword.
Signed-off-by: Emmanouil Pitsidianakis <manos.pitsidiana...@linaro.org> --- qobject/json-lexer.c | 4 ++-- qobject/json-parser.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/qobject/json-lexer.c b/qobject/json-lexer.c index 51341d96e4..ab74470ac6 100644 --- a/qobject/json-lexer.c +++ b/qobject/json-lexer.c @@ -312,7 +312,7 @@ static void json_lexer_feed_char(JSONLexer *lexer, char ch, bool flush) case JSON_STRING: json_message_process_token(lexer, lexer->token, new_state, lexer->x, lexer->y); - /* fall through */ + fallthrough; case IN_START: g_string_truncate(lexer->token, 0); new_state = lexer->start_state; @@ -321,7 +321,7 @@ static void json_lexer_feed_char(JSONLexer *lexer, char ch, bool flush) json_message_process_token(lexer, lexer->token, JSON_ERROR, lexer->x, lexer->y); new_state = IN_RECOVERY; - /* fall through */ + fallthrough; case IN_RECOVERY: g_string_truncate(lexer->token, 0); break; diff --git a/qobject/json-parser.c b/qobject/json-parser.c index d498db6e70..4dc622dcc9 100644 --- a/qobject/json-parser.c +++ b/qobject/json-parser.c @@ -214,7 +214,7 @@ static QString *parse_string(JSONParserContext *ctxt, JSONToken *token) } ptr++; } - /* fall through */ + fallthrough; default: cp = mod_utf8_codepoint(ptr, 6, &end); if (cp < 0) { @@ -518,8 +518,9 @@ static QObject *parse_literal(JSONParserContext *ctxt) } assert(ret == -ERANGE); } + /* fall through to JSON_FLOAT */ + fallthrough; } - /* 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, -- 2.39.2