Revert "update_engine: Merge contiguous operations."
This reverts commit 6a3ea94766bb4972abbd629779914d80dada1245.
The CL is suspected to close the tree due to paygen failures.
See comments inline (delta_diff_generator.cc) for the culprit.
BUG=chromium:486497
TEST=trybot
Change-Id: Iaed694a79371e7de208b0de90f8e9cefd61dd7e6
Reviewed-on: https://chromium-review.googlesource.com/270183
Trybot-Ready: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Cheng-Yi Chiang <cychiang@chromium.org>
Commit-Queue: Cheng-Yi Chiang <cychiang@chromium.org>
Tested-by: Cheng-Yi Chiang <cychiang@chromium.org>
diff --git a/utils.h b/utils.h
index 8f30ebd..3344a78 100644
--- a/utils.h
+++ b/utils.h
@@ -468,7 +468,7 @@
// extents are read from the file at |path|. |out_data_size| is the size of
// |out_data|. Returns false if the number of bytes to read given in
// |extents| does not equal |out_data_size|.
-bool ReadExtents(const std::string& path, const std::vector<Extent>& extents,
+bool ReadExtents(const std::string& path, std::vector<Extent>* extents,
chromeos::Blob* out_data, ssize_t out_data_size,
size_t block_size);