From 71aaf870c87b1dab289c945ea6702dfa7988229b Mon Sep 17 00:00:00 2001 From: "John W. Bruce" Date: Wed, 27 Oct 2021 12:41:47 -0700 Subject: [PATCH] Make implicit 64-to-32-bit conversions in `core_message_serialize.cpp` explicit (This is a merge of http://go/wvgerrit/134404.) There were two lines that were tripping Clang's `-Wshorten-64-to-32` warning. This CL makes both conversions explicit to appease the warning. There should be no change in behavior. Bug: 194971260 Test: ODK Unit Tests Change-Id: I6d111e9a4efc1f0e31b51e455c47c0e885d48e6b --- libwvdrmengine/oemcrypto/odk/src/core_message_serialize.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libwvdrmengine/oemcrypto/odk/src/core_message_serialize.cpp b/libwvdrmengine/oemcrypto/odk/src/core_message_serialize.cpp index 177e39ca..c55b8f69 100644 --- a/libwvdrmengine/oemcrypto/odk/src/core_message_serialize.cpp +++ b/libwvdrmengine/oemcrypto/odk/src/core_message_serialize.cpp @@ -56,7 +56,7 @@ bool CreateResponse(uint32_t message_type, const S& core_request, return false; } - uint32_t message_length = ODK_Message_GetSize(&msg); + uint32_t message_length = static_cast(ODK_Message_GetSize(&msg)); msg = ODK_Message_Create(buf.data() + sizeof(header->message_type), sizeof(header->message_length)); Pack_uint32_t(&msg, &message_length); @@ -72,7 +72,7 @@ bool CopyDeviceId(const ODK_ProvisioningRequest& src, if (request.device_id_length > sizeof(request.device_id)) { return false; } - request.device_id_length = device_id.size(); + request.device_id_length = static_cast(device_id.size()); memset(request.device_id, 0, sizeof(request.device_id)); memcpy(request.device_id, device_id.data(), request.device_id_length); return true;