Fix coverity warnings in firmware

Assorted minor code issues, which we should fix so any new errors stand
out more.

BUG=chromium:643769
BRANCH=none
TEST=make runtests

Change-Id: I84182df0d0e222f4f60206c621ec62e1ee283adb
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/380697
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
This commit is contained in:
Randall Spangler
2016-09-02 12:10:31 -07:00
committed by chrome-bot
parent f7559e4b46
commit 1589f94dc1
6 changed files with 37 additions and 26 deletions

View File

@@ -123,13 +123,20 @@ int AllocAndReadGptData(VbExDiskHandle_t disk_handle, GptData *gptdata)
int WriteAndFreeGptData(VbExDiskHandle_t disk_handle, GptData *gptdata)
{
int skip_primary = 0;
GptHeader *header = (GptHeader *)gptdata->primary_header;
uint64_t entries_bytes =
(uint64_t)header->number_of_entries
* header->size_of_entry;
uint64_t entries_sectors = entries_bytes / gptdata->sector_bytes;
GptHeader *header;
uint64_t entries_bytes, entries_sectors;
int ret = 1;
header = (GptHeader *)gptdata->primary_header;
if (!header)
header = (GptHeader *)gptdata->secondary_header;
if (!header)
return 1; /* No headers at all, so nothing to write */
entries_bytes = (uint64_t)header->number_of_entries
* header->size_of_entry;
entries_sectors = entries_bytes / gptdata->sector_bytes;
/*
* TODO(namnguyen): Preserve padding between primary GPT header and
* its entries.