EntityManager: Make MapperGetSubTreeResponse type comprehensible
From there, rework a bunch of uses of the unaliased types to use the new
aliased types and fix up some of the variable names to improve
readability.
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Change-Id: I498e0d93091cae43e59907ee1908afc97ac601ee
diff --git a/src/PerformScan.cpp b/src/PerformScan.cpp
index 5d05403..0998f22 100644
--- a/src/PerformScan.cpp
+++ b/src/PerformScan.cpp
@@ -51,10 +51,8 @@
}
systemBus->async_method_call(
- [call, scan, probeVector, retries](
- boost::system::error_code& errc,
- const boost::container::flat_map<std::string, DBusValueVariant>&
- resp) {
+ [call, scan, probeVector, retries](boost::system::error_code& errc,
+ const DBusInterface& resp) {
if (errc)
{
std::cerr << "error calling getall on " << std::get<0>(call)
@@ -210,9 +208,8 @@
}
}
-std::string getRecordName(
- const boost::container::flat_map<std::string, DBusValueVariant>& probe,
- const std::string& probeName)
+std::string getRecordName(const DBusInterface& probe,
+ const std::string& probeName)
{
if (probe.empty())
{
@@ -379,14 +376,12 @@
std::optional<std::string> replaceStr;
MapperGetSubTreeResponse::mapped_type emptyInterfaces;
- boost::container::flat_map<std::string, DBusValueVariant>
- emptyProps;
- emptyInterfaces.emplace(std::string{}, emptyProps);
+ DBusInterface emptyInterface;
+ emptyInterfaces.emplace(std::string{}, emptyInterface);
for (auto& foundDeviceAndPath : foundDevices)
{
- const boost::container::flat_map<
- std::string, DBusValueVariant>& foundDevice =
+ const DBusInterface& foundDevice =
std::get<0>(foundDeviceAndPath);
const std::string& path = std::get<1>(foundDeviceAndPath);