commit 710562a34b25e978d62a7047c127d06c268caee9
author Andrew Jeffery <andrew@aj.id.au> Thu Dec 02 14:55:55 2021 +1030
committer Andrew Jeffery <andrew@aj.id.au> Tue Dec 07 04:06:13 2021 +0000
tree 965a9604ba4f274375501bc1f21d4ce3bb4123d8
parent e671f057e27a6d279638d4abc53ccb248894fba9

NVMeSensorMain: Define deriveRootBusPath()

Continue lifting code from the lambda to simplify its implementation.

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Change-Id: I28614a557bf61e1c32075477f8926f8d2c632bc3

src/NVMeSensorMain.cpp

diff --git a/src/NVMeSensorMain.cpp b/src/NVMeSensorMain.cpp
index ed932cf..2621674 100644
--- a/src/NVMeSensorMain.cpp
+++ b/src/NVMeSensorMain.cpp
@@ -64,6 +64,12 @@
     return std::get<std::string>(findSensorName->second);
 }
 
+static std::filesystem::path deriveRootBusPath(int busNumber)
+{
+    return "/sys/bus/i2c/devices/i2c-" + std::to_string(busNumber) +
+           "/mux_device";
+}
+
 static void handleSensorConfigurations(
     boost::asio::io_service& io, sdbusplus::asio::object_server& objectServer,
     std::shared_ptr<sdbusplus::asio::connection>& dbusConnection,
@@ -125,8 +131,7 @@
 
         int rootBus = *busNumber;
 
-        std::string muxPath = "/sys/bus/i2c/devices/i2c-" +
-                              std::to_string(*busNumber) + "/mux_device";
+        std::filesystem::path muxPath = deriveRootBusPath(*busNumber);
 
         if (std::filesystem::is_symlink(muxPath))
         {