scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-11-25 18:55:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

vboot: Fix indentation in LoadKernel()

Browse Source 
BUG=None
BRANCH=none
TEST=compile

Change-Id: I286ccb2649ee0535d3fb092b4d445488f6385a65
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/267462
Reviewed-by: Randall Spangler <rspangler@chromium.org>
This commit is contained in:
Gwendal Grignou
2015-04-27 09:46:52 -07:00
committed by ChromeOS Commit Bot
parent a0185aecc9
commit e2e14ae827
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
firmware/lib/vboot_kernel.c
View File

@@ -86,7 +86,7 @@ VbError_t LoadKernel(LoadKernelParams *params, VbCommonParams *cparams)
* times, so we need to initialize the call entry each time. * times, so we need to initialize the call entry each time.
*/ */
shcall = shared->lk_calls + (shared->lk_call_count shcall = shared->lk_calls + (shared->lk_call_count
& (VBSD_MAX_KERNEL_CALLS - 1)); & (VBSD_MAX_KERNEL_CALLS - 1));
Memset(shcall, 0, sizeof(VbSharedDataKernelCall)); Memset(shcall, 0, sizeof(VbSharedDataKernelCall));
shcall->boot_flags = (uint32_t)params->boot_flags; shcall->boot_flags = (uint32_t)params->boot_flags;
shcall->boot_mode = boot_mode; shcall->boot_mode = boot_mode;
@@ -138,9 +138,9 @@ VbError_t LoadKernel(LoadKernelParams *params, VbCommonParams *cparams)
if (!kbuf) if (!kbuf)
goto bad_gpt; goto bad_gpt;
/* Loop over candidate kernel partitions */ /* Loop over candidate kernel partitions */
while (GPT_SUCCESS == while (GPT_SUCCESS ==
GptNextKernelEntry(&gpt, &part_start, &part_size)) { GptNextKernelEntry(&gpt, &part_start, &part_size)) {
VbSharedDataKernelPart *shpart = NULL; VbSharedDataKernelPart *shpart = NULL;
VbKeyBlockHeader *key_block; VbKeyBlockHeader *key_block;
VbKernelPreambleHeader *preamble; VbKernelPreambleHeader *preamble;
@@ -160,7 +160,7 @@ VbError_t LoadKernel(LoadKernelParams *params, VbCommonParams *cparams)
* time. * time.
*/ */
shpart = shcall->parts + (shcall->kernel_parts_found shpart = shcall->parts + (shcall->kernel_parts_found
& (VBSD_MAX_KERNEL_PARTS - 1)); & (VBSD_MAX_KERNEL_PARTS - 1));
Memset(shpart, 0, sizeof(VbSharedDataKernelPart)); Memset(shpart, 0, sizeof(VbSharedDataKernelPart));
shpart->sector_start = part_start; shpart->sector_start = part_start;
shpart->sector_count = part_size; shpart->sector_count = part_size;
@@ -319,7 +319,7 @@ VbError_t LoadKernel(LoadKernelParams *params, VbCommonParams *cparams)
else { else {
VBDEBUG(("Key block valid: %d\n", key_block_valid)); VBDEBUG(("Key block valid: %d\n", key_block_valid));
VBDEBUG(("Combined version: %u\n", VBDEBUG(("Combined version: %u\n",
(unsigned) combined_version)); (unsigned) combined_version));
} }
/* /*
@@ -469,7 +469,7 @@ VbError_t LoadKernel(LoadKernelParams *params, VbCommonParams *cparams)
/* Continue, so that we skip the error handling code below */ /* Continue, so that we skip the error handling code below */
continue; continue;
bad_kernel: bad_kernel:
/* Handle errors parsing this kernel */ /* Handle errors parsing this kernel */
if (NULL != stream) if (NULL != stream)
VbExStreamClose(stream); VbExStreamClose(stream);
@@ -480,9 +480,9 @@ VbError_t LoadKernel(LoadKernelParams *params, VbCommonParams *cparams)
GptUpdateKernelEntry(&gpt, GPT_UPDATE_ENTRY_BAD); GptUpdateKernelEntry(&gpt, GPT_UPDATE_ENTRY_BAD);
} /* while(GptNextKernelEntry) */ } /* while(GptNextKernelEntry) */
bad_gpt: bad_gpt:
/* Free kernel buffer */ /* Free kernel buffer */
if (kbuf) if (kbuf)
@@ -518,7 +518,7 @@ VbError_t LoadKernel(LoadKernelParams *params, VbCommonParams *cparams)
retval = VBERROR_NO_KERNEL_FOUND; retval = VBERROR_NO_KERNEL_FOUND;
} }
LoadKernelExit: LoadKernelExit:
/* Store recovery request, if any */ /* Store recovery request, if any */
VbNvSet(vnc, VBNV_RECOVERY_REQUEST, VBERROR_SUCCESS != retval ? VbNvSet(vnc, VBNV_RECOVERY_REQUEST, VBERROR_SUCCESS != retval ?