diff options
author | Randall Spangler <rspangler@chromium.org> | 2017-01-03 13:49:18 -0800 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2017-01-12 15:56:27 -0800 |
commit | 21015898b39aa8742057ed6e6423c308c8d0a15d (patch) | |
tree | 8221b6a48e13d8cdf15820cc92247167f8ac5fe0 /firmware/lib/vboot_common_init.c | |
parent | df4eb2bb7be9d61bfe9bdf6c33f836f358b18cf6 (diff) | |
download | vboot-21015898b39aa8742057ed6e6423c308c8d0a15d.tar.gz |
firmware: replace VBDEBUG(()) macro with VB2_DEBUG()
The original VBDEBUG macro used doubly-nested parens to work with
MSVC, which didn't support varargs in macros. We now only use more
modern compilers, so replace it with the VB2_DEBUG macro and get rid
of the ugly and fragile double parens.
BUG=chromium:611535
BRANCH=none
TEST=make runtests; build_packages --board=reef chromeos-firmware
Change-Id: Ifc0cb0733b14daaa1fde095fab7da4215a538c77
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/425133
Reviewed-by: Shelley Chen <shchen@chromium.org>
Diffstat (limited to 'firmware/lib/vboot_common_init.c')
-rw-r--r-- | firmware/lib/vboot_common_init.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/firmware/lib/vboot_common_init.c b/firmware/lib/vboot_common_init.c index 90edae68..b85c3cc3 100644 --- a/firmware/lib/vboot_common_init.c +++ b/firmware/lib/vboot_common_init.c @@ -6,23 +6,25 @@ * (Firmware portion) */ -#include "sysincludes.h" +#include "2sysincludes.h" +#include "2common.h" +#include "sysincludes.h" #include "vboot_api.h" #include "vboot_common.h" #include "utility.h" int VbSharedDataInit(VbSharedDataHeader *header, uint64_t size) { - VBDEBUG(("VbSharedDataInit, %d bytes, header %d bytes\n", (int)size, - (int)sizeof(VbSharedDataHeader))); + VB2_DEBUG("VbSharedDataInit, %d bytes, header %d bytes\n", (int)size, + (int)sizeof(VbSharedDataHeader)); if (size < sizeof(VbSharedDataHeader)) { - VBDEBUG(("Not enough data for header.\n")); + VB2_DEBUG("Not enough data for header.\n"); return VBOOT_SHARED_DATA_INVALID; } if (size < VB_SHARED_DATA_MIN_SIZE) { - VBDEBUG(("Shared data buffer too small.\n")); + VB2_DEBUG("Shared data buffer too small.\n"); return VBOOT_SHARED_DATA_INVALID; } |