diff options
| author | Bill Richardson <wfrichar@chromium.org> | 2011-05-09 15:30:33 -0700 |
|---|---|---|
| committer | Bill Richardson <wfrichar@chromium.org> | 2011-05-09 15:57:09 -0700 |
| commit | 4395b699c13bcce3f4152cc0f6f5cef9817d2537 (patch) | |
| tree | 9bf53f6e5e816cebf82e7783b9b442af5c1f9f75 | |
| parent | 54e95825b30d4f730cbd70c109fb6622dda6fbb8 (diff) | |
| download | vboot-4395b699c13bcce3f4152cc0f6f5cef9817d2537.tar.gz | |
Address compiler warnings (errors) for gcc-4.6
BUG=chromium-os:15043
TEST=manual
Change-Id: If6499d9453fd6f754d04076d0e2b6fd25fc636e5
Reviewed-on: http://gerrit.chromium.org/gerrit/562
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Tested-by: Bill Richardson <wfrichar@chromium.org>
| -rw-r--r-- | firmware/stub/tpm_lite_stub.c | 4 | ||||
| -rw-r--r-- | tests/vboot_common_tests.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/firmware/stub/tpm_lite_stub.c b/firmware/stub/tpm_lite_stub.c index 2351ee47..c1ef88b8 100644 --- a/firmware/stub/tpm_lite_stub.c +++ b/firmware/stub/tpm_lite_stub.c @@ -155,7 +155,9 @@ uint32_t TlclStubSendReceive(const uint8_t* request, int request_length, * // Error checking depending on the value of the status above */ uint32_t response_length = max_length; +#ifndef NDEBUG int tag, response_tag; +#endif struct timeval before, after; gettimeofday(&before, NULL); @@ -178,6 +180,7 @@ uint32_t TlclStubSendReceive(const uint8_t* request, int request_length, } #endif +#ifndef NDEBUG /* sanity checks */ tag = TpmTag(request); response_tag = TpmTag(response); @@ -189,6 +192,7 @@ uint32_t TlclStubSendReceive(const uint8_t* request, int request_length, (tag == TPM_TAG_RQU_AUTH2_COMMAND && response_tag == TPM_TAG_RSP_AUTH2_COMMAND)); assert(response_length == TpmResponseSize(response)); +#endif return 0; /* Success */ } diff --git a/tests/vboot_common_tests.c b/tests/vboot_common_tests.c index d01b2f93..aecf90cf 100644 --- a/tests/vboot_common_tests.c +++ b/tests/vboot_common_tests.c @@ -30,7 +30,7 @@ static void StructPackingTest(void) { static void VerifyHelperFunctions(void) { { - uint8_t p[1]; + uint8_t *p = (uint8_t *)VerifyHelperFunctions; TEST_EQ((int)OffsetOf(p, p), 0, "OffsetOf() equal"); TEST_EQ((int)OffsetOf(p, p+10), 10, "OffsetOf() positive"); TEST_EQ((int)OffsetOf(p, p+0x12345678), 0x12345678, "OffsetOf() large"); @@ -53,7 +53,7 @@ static void VerifyHelperFunctions(void) { } { - uint8_t p[1]; + uint8_t *p = (uint8_t *)VerifyHelperFunctions; TEST_EQ(VerifyMemberInside(p, 20, p, 6, 11, 3), 0, "MemberInside ok 1"); TEST_EQ(VerifyMemberInside(p, 20, p+4, 4, 8, 4), 0, "MemberInside ok 2"); TEST_EQ(VerifyMemberInside(p, 20, p-4, 4, 8, 4), 1, |