pnor_partition_table: Make writeSizes() private to namespace
This is part of the ongoing effort to extract parseTocLine() from the
Table class, enabling reuse in setup for test cases.
Change-Id: I1817023347575843e5518343c83a7f2eae6302a4
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
diff --git a/pnor_partition_table.cpp b/pnor_partition_table.cpp
index 8ee43c0..064a2d9 100644
--- a/pnor_partition_table.cpp
+++ b/pnor_partition_table.cpp
@@ -74,7 +74,8 @@
tbl.resize(totalSizeAligned);
}
-inline void Table::writeSizes(pnor_partition& part, size_t start, size_t end)
+static inline void writeSizes(pnor_partition& part, size_t start, size_t end,
+ size_t blockSize)
{
size_t size = end - start;
part.data.base = align_up(start, blockSize) / blockSize;
@@ -180,7 +181,7 @@
unsigned long start =
std::stoul(match[START_ADDR_MATCH].str(), nullptr, 16);
unsigned long end = std::stoul(match[END_ADDR_MATCH].str(), nullptr, 16);
- writeSizes(part, start, end);
+ writeSizes(part, start, end, blockSize);
// Use the shift to convert "80" to 0x80000000
unsigned long version = std::stoul(match[VERSION_MATCH].str(), nullptr, 16);
diff --git a/pnor_partition_table.hpp b/pnor_partition_table.hpp
index a333b5f..a3251fb 100644
--- a/pnor_partition_table.hpp
+++ b/pnor_partition_table.hpp
@@ -170,15 +170,6 @@
*/
void allocateMemory(const fs::path& tocFile);
- /** @brief Populate fields related to sizes for the input
- * pnor_partition structure.
- *
- * @param[in/out] part - pnor_partition structure
- * @param[in] start - partition start address
- * @param[in] end - partition end address
- */
- void writeSizes(pnor_partition& part, size_t start, size_t end);
-
/** @brief Return a little-endian partition table
*
* @returns reference to native partition table