From d8b67f49d7f8ae291cd4fa901b2d3767137704e7 Mon Sep 17 00:00:00 2001 From: Amin Hassani Date: Wed, 6 Dec 2017 13:47:52 -0800 Subject: update_engine: Remove the duplicate BlocksInExtents This patch removes the duplicate BlocksInExtents from extent_utils.h and fixes the remainder of the code to reflect this change. BUG=none TEST=unittests pass; Change-Id: I76f5106f75072b20cd8f41f081b2f2b07aeac9a8 Reviewed-on: https://chromium-review.googlesource.com/812009 Commit-Ready: Amin Hassani Tested-by: Amin Hassani Reviewed-by: Ben Chan Reviewed-by: Alex Deymo Reviewed-by: Sen Jiang --- payload_generator/deflate_utils.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'payload_generator/deflate_utils.cc') diff --git a/payload_generator/deflate_utils.cc b/payload_generator/deflate_utils.cc index 7a5d9a42..88e42e0d 100644 --- a/payload_generator/deflate_utils.cc +++ b/payload_generator/deflate_utils.cc @@ -49,7 +49,7 @@ bool CopyExtentsToFile(const string& in_path, const vector extents, const string& out_path, size_t block_size) { - brillo::Blob data(BlocksInExtents(extents) * block_size); + brillo::Blob data(utils::BlocksInExtents(extents) * block_size); TEST_AND_RETURN_FALSE( utils::ReadExtents(in_path, extents, &data, data.size(), block_size)); TEST_AND_RETURN_FALSE( @@ -61,7 +61,8 @@ bool IsSquashfsImage(const string& part_path, const FilesystemInterface::File& file) { // Only check for files with img postfix. if (base::EndsWith(file.name, ".img", base::CompareCase::SENSITIVE) && - BlocksInExtents(file.extents) >= kMinimumSquashfsImageSize / kBlockSize) { + utils::BlocksInExtents(file.extents) >= + kMinimumSquashfsImageSize / kBlockSize) { brillo::Blob super_block; TEST_AND_RETURN_FALSE( utils::ReadFileChunk(part_path, @@ -87,11 +88,11 @@ bool RealignSplittedFiles(const FilesystemInterface::File& file, ShiftBitExtentsOverExtents(file.extents, &in_file.deflates)); in_file.name = file.name + "/" + in_file.name; - num_blocks += BlocksInExtents(in_file.extents); + num_blocks += utils::BlocksInExtents(in_file.extents); } // Check that all files in |in_files| cover the entire image. - TEST_AND_RETURN_FALSE(BlocksInExtents(file.extents) == num_blocks); + TEST_AND_RETURN_FALSE(utils::BlocksInExtents(file.extents) == num_blocks); return true; } @@ -111,7 +112,8 @@ ByteExtent ExpandToByteExtent(const BitExtent& extent) { bool ShiftExtentsOverExtents(const vector& base_extents, vector* over_extents) { - if (BlocksInExtents(base_extents) < BlocksInExtents(*over_extents)) { + if (utils::BlocksInExtents(base_extents) < + utils::BlocksInExtents(*over_extents)) { LOG(ERROR) << "over_extents have more blocks than base_extents! Invalid!"; return false; } @@ -160,7 +162,7 @@ bool ShiftBitExtentsOverExtents(const vector& base_extents, // does not exceed |base_extents|. auto last_extent = ExpandToByteExtent(over_extents->back()); TEST_AND_RETURN_FALSE(last_extent.offset + last_extent.length <= - BlocksInExtents(base_extents) * kBlockSize); + utils::BlocksInExtents(base_extents) * kBlockSize); for (auto o_ext = over_extents->begin(); o_ext != over_extents->end();) { size_t gap_blocks = base_extents[0].start_block(); -- cgit v1.2.3