Snap for 12296955 from 99bf8018391fa3944f6658bc2967ab535fecd363 to 24Q4-release
Change-Id: I406a0978190b913b8c19df5abc4a16cc37fcefa7
diff --git a/payload_consumer/filesystem_verifier_action.cc b/payload_consumer/filesystem_verifier_action.cc
index 2934fb7..2e2f6b9 100644
--- a/payload_consumer/filesystem_verifier_action.cc
+++ b/payload_consumer/filesystem_verifier_action.cc
@@ -406,7 +406,6 @@
buffer_.resize(kReadFileBufferSize);
hasher_ = std::make_unique<HashCalculator>();
- offset_ = 0;
filesystem_data_end_ = partition_size_;
if (partition.fec_offset > 0) {
CHECK_LE(partition.hash_tree_offset, partition.fec_offset)
@@ -456,7 +455,7 @@
}
}
-size_t FilesystemVerifierAction::GetPartitionSize() const {
+uint64_t FilesystemVerifierAction::GetPartitionSize() const {
const InstallPlan::Partition& partition =
install_plan_.partitions[partition_index_];
switch (verifier_step_) {
diff --git a/payload_consumer/filesystem_verifier_action.h b/payload_consumer/filesystem_verifier_action.h
index 5bc44b1..d8cb902 100644
--- a/payload_consumer/filesystem_verifier_action.h
+++ b/payload_consumer/filesystem_verifier_action.h
@@ -109,7 +109,7 @@
bool IsVABC(const InstallPlan::Partition& partition) const;
- size_t GetPartitionSize() const;
+ uint64_t GetPartitionSize() const;
// When the read is done, finalize the hash checking of the current partition
// and continue checking the next one.
@@ -163,9 +163,6 @@
// partition in gpt.
uint64_t partition_size_{0};
- // The byte offset that we are reading in the current partition.
- uint64_t offset_{0};
-
// The end offset of filesystem data, first byte position of hashtree.
uint64_t filesystem_data_end_{0};