From 6208b9aa9c4e8b7c9ff8063965c9f9aa519c1740 Mon Sep 17 00:00:00 2001 From: Manoj Gupta Date: Mon, 4 Nov 2019 17:17:39 -0800 Subject: Reland: Clean up implicit fall through. Directly use the __attribute__ ((fallthrough)) instead of a macro. This was suggested in CL:1772474. BUG=chromium:997709 TEST=CQ BRANCH=None Change-Id: Ifcdcd3822eddea41aeb88f4a55bd09aa483f6054 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2031766 Tested-by: Manoj Gupta Reviewed-by: Julius Werner Commit-Queue: Manoj Gupta --- futility/cmd_dump_fmap.c | 4 ++-- futility/cmd_sign.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'futility') diff --git a/futility/cmd_dump_fmap.c b/futility/cmd_dump_fmap.c index ef46ffcd..48f9185c 100644 --- a/futility/cmd_dump_fmap.c +++ b/futility/cmd_dump_fmap.c @@ -444,7 +444,7 @@ static int do_dump_fmap(int argc, char *argv[]) break; case 'H': opt_gaps = 1; - VBOOT_FALLTHROUGH; + __attribute__ ((fallthrough)); case 'h': opt_format = FMT_HUMAN; opt_overlap++; @@ -507,7 +507,7 @@ static int do_dump_fmap(int argc, char *argv[]) case FMT_NORMAL: printf("hit at 0x%08x\n", (uint32_t) ((char *)fmap - (char *)base_of_rom)); - VBOOT_FALLTHROUGH; + __attribute__ ((fallthrough)); default: retval = normal_fmap(fmap, argc - optind - 1, diff --git a/futility/cmd_sign.c b/futility/cmd_sign.c index c69f7124..117a6536 100644 --- a/futility/cmd_sign.c +++ b/futility/cmd_sign.c @@ -719,7 +719,7 @@ static int do_sign(int argc, char *argv[]) break; case OPT_FV: sign_option.fv_specified = 1; - VBOOT_FALLTHROUGH; + __attribute__ ((fallthrough)); case OPT_INFILE: sign_option.inout_file_count++; infile = optarg; -- cgit v1.2.1