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> --- qapi/opts-visitor.c | 1 + qapi/string-input-visitor.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c index 8f1efab8b9..d7376bf239 100644 --- a/qapi/opts-visitor.c +++ b/qapi/opts-visitor.c @@ -249,41 +249,42 @@ static GenericList * opts_next_list(Visitor *v, GenericList *tail, size_t size) { OptsVisitor *ov = to_ov(v); switch (ov->list_mode) { case LM_TRAVERSED: return NULL; case LM_SIGNED_INTERVAL: case LM_UNSIGNED_INTERVAL: if (ov->list_mode == LM_SIGNED_INTERVAL) { if (ov->range_next.s < ov->range_limit.s) { ++ov->range_next.s; break; } } else if (ov->range_next.u < ov->range_limit.u) { ++ov->range_next.u; break; } ov->list_mode = LM_IN_PROGRESS; /* range has been completed, fall through in order to pop option */ + fallthrough; case LM_IN_PROGRESS: { const QemuOpt *opt; opt = g_queue_pop_head(ov->repeated_opts); if (g_queue_is_empty(ov->repeated_opts)) { g_hash_table_remove(ov->unprocessed_opts, opt->name); ov->repeated_opts = NULL; ov->list_mode = LM_TRAVERSED; return NULL; } break; } default: abort(); } tail->next = g_malloc0(size); return tail->next; } diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c index 197139c1c0..1ce43da20b 100644 --- a/qapi/string-input-visitor.c +++ b/qapi/string-input-visitor.c @@ -182,41 +182,41 @@ static int try_parse_int64_list_entry(StringInputVisitor *siv, int64_t *obj) static bool parse_type_int64(Visitor *v, const char *name, int64_t *obj, Error **errp) { StringInputVisitor *siv = to_siv(v); int64_t val; switch (siv->lm) { case LM_NONE: /* just parse a simple int64, bail out if not completely consumed */ if (qemu_strtoi64(siv->string, NULL, 0, &val)) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, name ? name : "null", "int64"); return false; } *obj = val; return true; case LM_UNPARSED: if (try_parse_int64_list_entry(siv, obj)) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, name ? name : "null", "list of int64 values or ranges"); return false; } assert(siv->lm == LM_INT64_RANGE); - /* fall through */ + fallthrough; case LM_INT64_RANGE: /* return the next element in the range */ assert(siv->rangeNext.i64 <= siv->rangeEnd.i64); *obj = siv->rangeNext.i64++; if (siv->rangeNext.i64 > siv->rangeEnd.i64 || *obj == INT64_MAX) { /* end of range, check if there is more to parse */ siv->lm = siv->unparsed_string[0] ? LM_UNPARSED : LM_END; } return true; case LM_END: error_setg(errp, "Fewer list elements expected"); return false; default: abort(); } } @@ -272,41 +272,41 @@ static int try_parse_uint64_list_entry(StringInputVisitor *siv, uint64_t *obj) static bool parse_type_uint64(Visitor *v, const char *name, uint64_t *obj, Error **errp) { StringInputVisitor *siv = to_siv(v); uint64_t val; switch (siv->lm) { case LM_NONE: /* just parse a simple uint64, bail out if not completely consumed */ if (qemu_strtou64(siv->string, NULL, 0, &val)) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, name ? name : "null", "uint64"); return false; } *obj = val; return true; case LM_UNPARSED: if (try_parse_uint64_list_entry(siv, obj)) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, name ? name : "null", "list of uint64 values or ranges"); return false; } assert(siv->lm == LM_UINT64_RANGE); - /* fall through */ + fallthrough; case LM_UINT64_RANGE: /* return the next element in the range */ assert(siv->rangeNext.u64 <= siv->rangeEnd.u64); *obj = siv->rangeNext.u64++; if (siv->rangeNext.u64 > siv->rangeEnd.u64 || *obj == UINT64_MAX) { /* end of range, check if there is more to parse */ siv->lm = siv->unparsed_string[0] ? LM_UNPARSED : LM_END; } return true; case LM_END: error_setg(errp, "Fewer list elements expected"); return false; default: abort(); } } -- 2.39.2