vboot_reference: fix several syntax warnings found by clang.
BUG=chromium:475949
TEST=CC=x86_64-cros-linux-gnu-clang CXX=x86_64-cros-linux-gnu-clang++
emerge-falco vboot_reference
BRANCH=none
Change-Id: I3341e840c3f26f8579d35e0bb411566b0ad86164
Reviewed-on: https://chromium-review.googlesource.com/265834
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Commit-Queue: Yunlian Jiang <yunlian@chromium.org>
Tested-by: Yunlian Jiang <yunlian@chromium.org>
diff --git a/firmware/lib20/common.c b/firmware/lib20/common.c
index 9ce9d84..cee6cb4 100644
--- a/firmware/lib20/common.c
+++ b/firmware/lib20/common.c
@@ -28,14 +28,14 @@
const ptrdiff_t data_end_offs = data_offs + member_data_size;
/* Make sure parent doesn't wrap */
- if (parent_size < 0 || parent_end < (uintptr_t)parent)
+ if (parent_end < (uintptr_t)parent)
return VB2_ERROR_INSIDE_PARENT_WRAPS;
/*
* Make sure the member is fully contained in the parent and doesn't
* wrap. Use >, not >=, since member_size = 0 is possible.
*/
- if (member_size < 0 || member_end_offs < member_offs)
+ if (member_end_offs < member_offs)
return VB2_ERROR_INSIDE_MEMBER_WRAPS;
if (member_offs < 0 || member_offs > parent_size ||
member_end_offs > parent_size)
@@ -46,7 +46,7 @@
return VB2_ERROR_INSIDE_DATA_OVERLAP;
/* Make sure parent fully contains member data, if any */
- if (member_data_size < 0 || data_end_offs < data_offs)
+ if (data_end_offs < data_offs)
return VB2_ERROR_INSIDE_DATA_WRAPS;
if (data_offs < 0 || data_offs > parent_size ||
data_end_offs > parent_size)
diff --git a/futility/file_type.c b/futility/file_type.c
index 08fd00e..dff5d29 100644
--- a/futility/file_type.c
+++ b/futility/file_type.c
@@ -31,7 +31,7 @@
};
/* Populate a list of file types and operator functions. */
-static const struct futil_file_type_s const futil_file_types[] = {
+static const struct futil_file_type_s futil_file_types[] = {
{"unknown", "not something we know about", 0, 0, 0},
#define R_(x) x
#define S_(x) x
diff --git a/host/arch/x86/lib/crossystem_arch.c b/host/arch/x86/lib/crossystem_arch.c
index 15a6433..84a49ee 100644
--- a/host/arch/x86/lib/crossystem_arch.c
+++ b/host/arch/x86/lib/crossystem_arch.c
@@ -587,11 +587,9 @@
} else if (*gpio_num >= 0x1000) {
*gpio_num -= 0x1000;
expected_uid = 2;
- } else if (*gpio_num >= 0x0000) {
+ } else {
*gpio_num -= 0x0000;
expected_uid = 1;
- } else {
- return 0;
}
dir = opendir(GPIO_BASE_PATH);
