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/extent_utils.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'payload_generator/extent_utils.h') diff --git a/payload_generator/extent_utils.h b/payload_generator/extent_utils.h index 3e45264b..f5fbb0e0 100644 --- a/payload_generator/extent_utils.h +++ b/payload_generator/extent_utils.h @@ -32,31 +32,12 @@ namespace chromeos_update_engine { // into an arbitrary place in the extents. void AppendBlockToExtents(std::vector* extents, uint64_t block); -// Get/SetElement are intentionally overloaded so that templated functions -// can accept either type of collection of Extents. -Extent GetElement(const std::vector& collection, size_t index); -Extent GetElement( - const google::protobuf::RepeatedPtrField& collection, - size_t index); - -// Return the total number of blocks in a collection (vector or -// RepeatedPtrField) of Extents. -template -uint64_t BlocksInExtents(const T& collection) { - uint64_t ret = 0; - for (size_t i = 0; i < static_cast(collection.size()); ++i) { - ret += GetElement(collection, i).num_blocks(); - } - return ret; -} - // Takes a collection (vector or RepeatedPtrField) of Extent and // returns a vector of the blocks referenced, in order. template std::vector ExpandExtents(const T& extents) { std::vector ret; - for (size_t i = 0, e = static_cast(extents.size()); i != e; ++i) { - const Extent extent = GetElement(extents, i); + for (const auto& extent : extents) { if (extent.start_block() == kSparseHole) { ret.resize(ret.size() + extent.num_blocks(), kSparseHole); } else { -- cgit v1.2.3