commit 9afef3a369015307d042b679d876f567fc6aea3e
author Zev Weiss <zev@bewilderbeest.net> Wed Jul 13 16:38:23 2022 -0700
committer Ed Tanous <ed@tanous.net> Sat Jul 16 01:15:57 2022 +0000
tree 1be2771fb0c9ee16340394164d79561578be82ee
parent c11b5da3aeba2a974ace26f9e2a4837d024bbe14

overlay: Factor out deviceDirName() routine

Replace a couple open-coded instances of this pattern with a dedicated
function, and rename a variable in deviceIsCreate() to avoid potential
confusion between 'dirName' and 'directoryName'.

Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
Change-Id: Ib3bc2591ec996dda296b82e5fcc3dc1300878ff1

src/overlay.cpp

diff --git a/src/overlay.cpp b/src/overlay.cpp
index 9bb53e7..889253b 100644
--- a/src/overlay.cpp
+++ b/src/overlay.cpp
@@ -61,6 +61,13 @@
     return in.dump();
 }
 
+static std::string deviceDirName(uint64_t bus, uint64_t address)
+{
+    std::ostringstream name;
+    name << bus << "-" << std::hex << std::setw(4) << std::setfill('0') << address;
+    return name.str();
+}
+
 void linkMux(const std::string& muxName, size_t busIndex, size_t address,
              const nlohmann::json::array_t& channelNames)
 {
@@ -72,11 +79,8 @@
     std::filesystem::path linkDir = muxSymlinkDirPath / muxName;
     std::filesystem::create_directory(linkDir, ec);
 
-    std::ostringstream hexAddress;
-    hexAddress << std::hex << std::setfill('0') << std::setw(4) << address;
-
     std::filesystem::path devDir(i2CDevsDir);
-    devDir /= std::to_string(busIndex) + "-" + hexAddress.str();
+    devDir /= deviceDirName(busIndex, address);
 
     for (std::size_t channelIndex = 0; channelIndex < channelNames.size();
          channelIndex++)
@@ -163,10 +167,7 @@
         return false;
     }
 
-    std::ostringstream hex;
-    hex << std::hex << std::setw(4) << std::setfill('0') << *address;
-    std::string addressHex = hex.str();
-    std::string busStr = std::to_string(*bus);
+    std::string dirName = deviceDirName(*bus, *address);
 
     std::error_code ec;
     auto path = std::filesystem::recursive_directory_iterator(busPath, ec);
@@ -182,11 +183,8 @@
             continue;
         }
 
-        const std::string directoryName = path->path().filename();
-        std::string name = busStr;
-        name += "-";
-        name += addressHex;
-        if (directoryName == name)
+        const std::string foundName = path->path().filename();
+        if (foundName == dirName)
         {
             // The first time the BMC boots the kernel has creates a
             // filesystem enumerating the I2C devices. The I2C device has not
@@ -213,7 +211,7 @@
             {
                 std::error_code ec;
                 std::filesystem::path hwmonDir(busPath);
-                hwmonDir /= directoryName;
+                hwmonDir /= dirName;
                 hwmonDir /= "hwmon";
                 return std::filesystem::is_directory(hwmonDir, ec);
             }