commit 54e9122643359a0e81212986ceea562b4d9e19f7
author Andrew Jeffery <andrew@aj.id.au> Wed Feb 21 16:14:44 2018 +1030
committer Andrew Jeffery <andrew@aj.id.au> Sat Mar 24 13:59:32 2018 +1030
tree 1cb0aba83ef22897c80c1077aa534526f7057be6
parent 62de1aae27fc324c1864bfa4f788481041a48eb3

pnor_partition_table: Make writeNameAndId() 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: I676e536e651dff1b27d0e53ecbb96d8e5ae8f025
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>

pnor_partition_table.cpp

diff --git a/pnor_partition_table.cpp b/pnor_partition_table.cpp
index 64fdfb5..871adbe 100644
--- a/pnor_partition_table.cpp
+++ b/pnor_partition_table.cpp
@@ -143,7 +143,7 @@
     part.data.flags = 0; // flags unused
 }
 
-inline void Table::writeNameAndId(pnor_partition& part, std::string&& name,
+static inline void writeNameAndId(pnor_partition& part, std::string&& name,
                                   const std::string& id)
 {
     name.resize(PARTITION_NAME_MAX);

pnor_partition_table.hpp

diff --git a/pnor_partition_table.hpp b/pnor_partition_table.hpp
index 6e9d2fa..5b49979 100644
--- a/pnor_partition_table.hpp
+++ b/pnor_partition_table.hpp
@@ -194,16 +194,6 @@
     void writeUserdata(pnor_partition& part, uint32_t version,
                        const std::string& data);
 
-    /** @brief Populate the name and id fields for the input
-     *         pnor_partition structure.
-     *
-     *  @param[in/out] part - pnor_partition structure
-     *  @param[in] name - partition name
-     *  @param[id] id - partition id
-     */
-    void writeNameAndId(pnor_partition& part, std::string&& name,
-                        const std::string& id);
-
     /** @brief Populate default/unused fields for the input
      *         pnor_partition structure.
      *