diff options
| author | Simon Glass <sjg@chromium.org> | 2013-08-15 21:32:08 -0600 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-08-25 16:57:28 -0700 |
| commit | 3401fdcd4125beea1a8cb1cc59ee27df89d4d88a (patch) | |
| tree | 5fd2c191d0f98ab276bf11f87c88d3c7fbfe222a | |
| parent | 47779880b28f2c549dd3349d8f28d68a0f784eb4 (diff) | |
| download | vboot-3401fdcd4125beea1a8cb1cc59ee27df89d4d88a.tar.gz | |
Correct some minor compiler warnings
A few places in the code through up warnings when building with strict
compiler flags. Correct these.
BUG=chrome-os-partner:21115
BRANCH=pit
TEST=manual
Build with:
FEATURES=test emerge-peach_pit vboot_reference
and see that iot now succeeds. Warnings include:
host/arch/arm/lib/crossystem_arch.c: In function 'ReadFdtValue':
host/arch/arm/lib/crossystem_arch.c:93:8: error: ignoring return value of 'fread', declared with attribute warn_unused_result [-Werror=unused-result]
Change-Id: I765723636e5f8979b794925c7b610081b2849026
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/66174
| -rw-r--r-- | futility/futility.c | 3 | ||||
| -rw-r--r-- | host/arch/arm/lib/crossystem_arch.c | 5 | ||||
| -rw-r--r-- | host/lib/host_keyblock.c | 2 | ||||
| -rw-r--r-- | tests/vboot_api_kernel_tests.c | 5 |
4 files changed, 10 insertions, 5 deletions
diff --git a/futility/futility.c b/futility/futility.c index 54921d1a..35620865 100644 --- a/futility/futility.c +++ b/futility/futility.c @@ -108,7 +108,8 @@ static void log_str(char *str) return; } - write(log_fd, "\n", 1); + if (write(log_fd, "\n", 1) < 0) + return; } static void log_close(void) diff --git a/host/arch/arm/lib/crossystem_arch.c b/host/arch/arm/lib/crossystem_arch.c index 033632e4..99b86897 100644 --- a/host/arch/arm/lib/crossystem_arch.c +++ b/host/arch/arm/lib/crossystem_arch.c @@ -90,7 +90,10 @@ static int ReadFdtValue(const char *property, int *value) { return E_FILEOP; } - fread(&data, 1, sizeof(data), file); + if (fread(&data, 1, sizeof(data), file) != sizeof(data)) { + fprintf(stderr, "Unable to read FDT property %s\n", property); + return E_FILEOP; + } fclose(file); if (value) diff --git a/host/lib/host_keyblock.c b/host/lib/host_keyblock.c index b12f024f..e1dd95be 100644 --- a/host/lib/host_keyblock.c +++ b/host/lib/host_keyblock.c @@ -147,7 +147,7 @@ VbKeyBlockHeader* KeyBlockRead(const char* filename) { /* Verify the hash of the key block, since we can do that without * the public signing key. */ if (0 != KeyBlockVerify(block, file_size, NULL, 1)) { - VBDEBUG(("Invalid key block file: filename\n", filename)); + VBDEBUG(("Invalid key block file: %s\n", filename)); free(block); return NULL; } diff --git a/tests/vboot_api_kernel_tests.c b/tests/vboot_api_kernel_tests.c index 56cb2104..87dc6cfa 100644 --- a/tests/vboot_api_kernel_tests.c +++ b/tests/vboot_api_kernel_tests.c @@ -234,7 +234,8 @@ VbError_t VbExDiskGetInfo(VbDiskInfo **infos_ptr, uint32_t *count, t->disks_to_provide[i].flags; mock_disks[num_disks].handle = (VbExDiskHandle_t) t->disks_to_provide[i].diskname; - VBDEBUG((" mock_disk[%d] %lld %lld 0x%x %s\n", i, + VBDEBUG((" mock_disk[%d] %" PRIu64 " %" PRIu64 + " 0x%x %s\n", i, mock_disks[num_disks].bytes_per_lba, mock_disks[num_disks].lba_count, mock_disks[num_disks].flags, @@ -253,7 +254,7 @@ VbError_t VbExDiskGetInfo(VbDiskInfo **infos_ptr, uint32_t *count, else *count = num_disks; - VBDEBUG((" *count=%lld\n", *count)); + VBDEBUG((" *count=%" PRIu32 "\n", *count)); VBDEBUG((" return 0x%x\n", t->diskgetinfo_return_val)); return t->diskgetinfo_return_val; |