coreboot-mirror
/
vboot
mirror of https://review.coreboot.org/vboot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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 <manojgupta@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Commit-Queue: Manoj Gupta <manojgupta@chromium.org>
This commit is contained in:
Manoj Gupta 2019-11-04 17:17:39 -08:00 committed by Commit Bot
parent 0e97e25e85
commit 6208b9aa9c
7 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
firmware/2lib/include/2common.h
View File

@ -71,27 +71,6 @@ struct vb2_public_key;
#endif
#endif
// Have a generic fall-through for different versions of C/C++.
// Taken from boringssl.
#if defined(__cplusplus) && __cplusplus >= 201703L
#define VBOOT_FALLTHROUGH [[fallthrough]]
#elif defined(__cplusplus) && __cplusplus >= 201103L && defined(__clang__)
#define VBOOT_FALLTHROUGH [[clang::fallthrough]]
#elif defined(__cplusplus) && __cplusplus >= 201103L && defined(__GNUC__) && \
__GNUC__ >= 7
#define VBOOT_FALLTHROUGH [[gnu::fallthrough]]
#elif defined(__GNUC__) && __GNUC__ >= 7 // gcc 7
#define VBOOT_FALLTHROUGH __attribute__((fallthrough))
#elif defined(__clang__)
#if __has_attribute(fallthrough)
#define VBOOT_FALLTHROUGH __attribute__((fallthrough))
#else // clang versions that do not support fallthrough.
#define VBOOT_FALLTHROUGH
#endif
#else // C++11 on gcc 6, and all other cases
#define VBOOT_FALLTHROUGH
#endif
/**
* Round up a number to a multiple of VB2_WORKBUF_ALIGN
*

2
firmware/lib/cgptlib/cgptlib.c
View File

@ -143,8 +143,8 @@ int GptUpdateKernelWithEntry(GptData *gpt, GptEntry *e, uint32_t update_type)
break;
}
/* Out of tries, so drop through and mark partition bad. */
__attribute__ ((fallthrough));
}
VBOOT_FALLTHROUGH;
case GPT_UPDATE_ENTRY_BAD: {
/* Giving up on this partition entirely. */
if (!GetEntrySuccessful(e)) {

2
firmware/lib/vboot_api_kernel.c
View File

@ -353,7 +353,7 @@ vb2_error_t vb2_commit_data(struct vb2_context *ctx)
default:
VB2_DEBUG("unknown commit error: %#x\n", rv);
VBOOT_FALLTHROUGH;
__attribute__ ((fallthrough));
case VB2_ERROR_NV_WRITE:
if (!(ctx->flags & VB2_CONTEXT_RECOVERY_MODE))

4
firmware/lib/vboot_ui.c
View File

@ -260,7 +260,7 @@ static vb2_error_t vb2_enter_vendor_data_ui(struct vb2_context *ctx,
return VB2_SUCCESS;
case 'a'...'z':
key = toupper(key);
VBOOT_FALLTHROUGH;
__attribute__ ((fallthrough));
case '0'...'9':
case 'A'...'Z':
if ((len > 0 && is_vowel(key)) ||
@ -585,7 +585,7 @@ static vb2_error_t vb2_developer_ui(struct vb2_context *ctx)
/* Only disable virtual dev switch if allowed by GBB */
if (!(gbb->flags & VB2_GBB_FLAG_ENTER_TRIGGERS_TONORM))
break;
VBOOT_FALLTHROUGH;
__attribute__ ((fallthrough));
case ' ':
/* See if we should disable virtual dev-mode switch. */
VB2_DEBUG("sd->flags=%#x\n", sd->flags);

4
futility/cmd_dump_fmap.c
View File

@ -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,

2
futility/cmd_sign.c
View File

@ -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;

2
host/lib/crossystem.c
View File

@ -413,7 +413,7 @@ static int GetVdatInt(VdatIntField field)
break;
case VDAT_INT_FW_BOOT2:
value = (sh->flags & VBSD_BOOT_FIRMWARE_VBOOT2 ? 1 : 0);
VBOOT_FALLTHROUGH;
__attribute__ ((fallthrough));
default:
break;
}