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

Unified Diff: src/platform/update_engine/delta_diff_generator.cc

Issue 1599029: update engine: 32- and 64-bit compile (Closed)
Patch Set: int32->int32_t, PRIi64, 80 cols for review Created 10 years, 8 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: src/platform/update_engine/delta_diff_generator.cc
diff --git a/src/platform/update_engine/delta_diff_generator.cc b/src/platform/update_engine/delta_diff_generator.cc
index 4181057b0abd5093b989f7f92b427b4fa0eeab04..74bcaa0d85d426f03ea65720c7d2b97227dc3b9e 100644
--- a/src/platform/update_engine/delta_diff_generator.cc
+++ b/src/platform/update_engine/delta_diff_generator.cc
@@ -691,7 +691,6 @@ bool DeltaDiffGenerator::GenerateDeltaUpdateFile(const string& old_root,
vector<Block> blocks(min(old_image_stbuf.st_size / kBlockSize,
new_image_stbuf.st_size / kBlockSize));
- LOG(INFO) << "blocks (orig): " << (uint32)(&blocks);
LOG(INFO) << "w:" << blocks[4097].writer;
LOG(INFO) << "invalid: " << Vertex::kInvalidIndex;
LOG(INFO) << "len: " << blocks.size();
@@ -826,7 +825,7 @@ bool DeltaDiffGenerator::GenerateDeltaUpdateFile(const string& old_root,
// Write header
TEST_AND_RETURN_FALSE(writer.Write(kDeltaMagic, strlen(kDeltaMagic)) ==
- strlen(kDeltaMagic));
+ static_cast<ssize_t>(strlen(kDeltaMagic)));
// Write version number
TEST_AND_RETURN_FALSE(WriteUint64AsBigEndian(&writer, kVersionNumber));

Powered by Google App Engine
This is Rietveld 408576698