Add type casts to silence warnings intorduced by protobuf v3.0.0
Bug: b/28974522
Change-Id: I1a5a26ea503747b786ed38ae5d6a586340a5fe2e
diff --git a/payload_consumer/delta_performer.cc b/payload_consumer/delta_performer.cc
index 541ee0f..072cd57 100644
--- a/payload_consumer/delta_performer.cc
+++ b/payload_consumer/delta_performer.cc
@@ -1067,8 +1067,10 @@
vector<string> source_extents;
for (const Extent& ext : operation.src_extents()) {
- source_extents.push_back(base::StringPrintf(
- "%" PRIu64 ":%" PRIu64, ext.start_block(), ext.num_blocks()));
+ source_extents.push_back(
+ base::StringPrintf("%" PRIu64 ":%" PRIu64,
+ static_cast<uint64_t>(ext.start_block()),
+ static_cast<uint64_t>(ext.num_blocks())));
}
LOG(ERROR) << "Operation source (offset:size) in blocks: "
<< base::JoinString(source_extents, ",");
@@ -1152,8 +1154,9 @@
for (int i = 0; i < extents.size(); i++) {
Extent extent = extents.Get(i);
int64_t start = extent.start_block() * block_size;
- uint64_t this_length = min(full_length - length,
- extent.num_blocks() * block_size);
+ uint64_t this_length =
+ min(full_length - length,
+ static_cast<uint64_t>(extent.num_blocks()) * block_size);
ret += base::StringPrintf("%" PRIi64 ":%" PRIu64 ",", start, this_length);
length += this_length;
}
@@ -1239,8 +1242,8 @@
brillo::Blob buf(kMaxBlocksToRead * block_size_);
for (const Extent& extent : operation.src_extents()) {
for (uint64_t i = 0; i < extent.num_blocks(); i += kMaxBlocksToRead) {
- uint64_t blocks_to_read =
- min(kMaxBlocksToRead, extent.num_blocks() - i);
+ uint64_t blocks_to_read = min(
+ kMaxBlocksToRead, static_cast<uint64_t>(extent.num_blocks()) - i);
ssize_t bytes_to_read = blocks_to_read * block_size_;
ssize_t bytes_read_this_iteration = 0;
TEST_AND_RETURN_FALSE(
diff --git a/payload_generator/delta_diff_utils.cc b/payload_generator/delta_diff_utils.cc
index 137a77b..41bf0b3 100644
--- a/payload_generator/delta_diff_utils.cc
+++ b/payload_generator/delta_diff_utils.cc
@@ -404,8 +404,8 @@
: InstallOperation::MOVE);
uint64_t chunk_num_blocks =
- std::min(extent.num_blocks() - op_block_offset,
- static_cast<uint64_t>(chunk_blocks));
+ std::min(static_cast<uint64_t>(extent.num_blocks()) - op_block_offset,
+ static_cast<uint64_t>(chunk_blocks));
// The current operation represents the move/copy operation for the
// sublist starting at |used_blocks| of length |chunk_num_blocks| where
diff --git a/payload_generator/delta_diff_utils_unittest.cc b/payload_generator/delta_diff_utils_unittest.cc
index ce02a54..7044b95 100644
--- a/payload_generator/delta_diff_utils_unittest.cc
+++ b/payload_generator/delta_diff_utils_unittest.cc
@@ -93,8 +93,9 @@
break;
TEST_AND_RETURN_FALSE(
fseek(fp.get(), extent.start_block() * block_size, SEEK_SET) == 0);
- uint64_t to_write = std::min(extent.num_blocks() * block_size,
- data.size() - offset);
+ uint64_t to_write =
+ std::min(static_cast<uint64_t>(extent.num_blocks()) * block_size,
+ static_cast<uint64_t>(data.size()) - offset);
TEST_AND_RETURN_FALSE(
fwrite(data.data() + offset, 1, to_write, fp.get()) == to_write);
offset += extent.num_blocks() * block_size;
diff --git a/payload_generator/extent_utils.cc b/payload_generator/extent_utils.cc
index 72e4b7c..89ccca2 100644
--- a/payload_generator/extent_utils.cc
+++ b/payload_generator/extent_utils.cc
@@ -99,8 +99,9 @@
string ExtentsToString(const vector<Extent>& extents) {
string ext_str;
for (const Extent& e : extents)
- ext_str += base::StringPrintf(
- "[%" PRIu64 ", %" PRIu64 "] ", e.start_block(), e.num_blocks());
+ ext_str += base::StringPrintf("[%" PRIu64 ", %" PRIu64 "] ",
+ static_cast<uint64_t>(e.start_block()),
+ static_cast<uint64_t>(e.num_blocks()));
return ext_str;
}