Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Unified Diff: firmware/lib/vboot_firmware.c

Issue 2851015: Fixes to compiler warnings in MSVC (Closed) Base URL: ssh://gitrw.chromium.org/vboot_reference.git
Patch Set: Also fix gpt numbering bug Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: firmware/lib/vboot_firmware.c
diff --git a/firmware/lib/vboot_firmware.c b/firmware/lib/vboot_firmware.c
index 88d6bb6488449d60fd30ce370d00d37201ce8393..2fb1f6cc7b692c0af80d55c6da4b85571f3f7ddf 100644
--- a/firmware/lib/vboot_firmware.c
+++ b/firmware/lib/vboot_firmware.c
@@ -48,6 +48,8 @@ int LoadFirmware(LoadFirmwareParams* params) {
params->kernel_sign_key_blob = NULL;
params->kernel_sign_key_size = 0;
+ debug("LoadFirmware started...\n");
+
/* Must have a root key */
if (!root_key)
return LOAD_FIRMWARE_RECOVERY;
@@ -64,7 +66,7 @@ int LoadFirmware(LoadFirmwareParams* params) {
lfi = (VbLoadFirmwareInternal*)Malloc(sizeof(VbLoadFirmwareInternal));
if (!lfi)
return LOAD_FIRMWARE_RECOVERY;
- params->load_firmware_internal = lfi;
+ params->load_firmware_internal = (uint8_t*)lfi;
/* Loop over indices */
for (index = 0; index < 2; index++) {
@@ -192,8 +194,8 @@ int LoadFirmware(LoadFirmwareParams* params) {
(lowest_key_version == tpm_key_version &&
lowest_fw_version > tpm_fw_version)) {
if (0 != WriteStoredVersions(FIRMWARE_VERSIONS,
- lowest_key_version,
- lowest_fw_version))
+ (uint16_t)lowest_key_version,
+ (uint16_t)lowest_fw_version))
return LOAD_FIRMWARE_RECOVERY;
}

Powered by Google App Engine
This is Rietveld 408576698