scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-12 02:45:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct some minor compiler warnings

Browse Source 
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
This commit is contained in:
Simon Glass
2013-08-15 21:32:08 -06:00
committed by ChromeBot
parent 47779880b2
commit 3401fdcd41
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
futility/futility.c
View File

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

5
host/arch/arm/lib/crossystem_arch.c
View File

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

2
host/lib/host_keyblock.c
View File

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

5
tests/vboot_api_kernel_tests.c
View File

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