commit a4d2768c83c04b8f9a640858b7343c44e7deea6d
author Zev Weiss <zev@bewilderbeest.net> Tue Jul 19 15:30:36 2022 -0700
committer Ed Tanous <ed@tanous.net> Wed Jul 20 14:37:33 2022 +0000
tree b2e3310b0199571efb37170a91acba5ad8d6a86d
parent afd150439db5c1fcbd437b25636124b56f8ab754

Factor out getPowerState() helper function

This same pattern had been open-coded in many of the sensor daemons;
let's reduce the duplication a bit.

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

src/FanMain.cpp

diff --git a/src/FanMain.cpp b/src/FanMain.cpp
index ff0ffaa..c55757c 100644
--- a/src/FanMain.cpp
+++ b/src/FanMain.cpp
@@ -405,17 +405,7 @@
                 redundancy = &systemRedundancy;
             }
 
-            PowerState powerState = PowerState::on;
-            auto findPower = baseConfiguration->second.find("PowerState");
-            if (findPower != baseConfiguration->second.end())
-            {
-                const auto* ptrPower =
-                    std::get_if<std::string>(&(findPower->second));
-                if (ptrPower != nullptr)
-                {
-                    setReadState(*ptrPower, powerState);
-                }
-            }
+            PowerState powerState = getPowerState(baseConfiguration->second);
 
             constexpr double defaultMaxReading = 25000;
             constexpr double defaultMinReading = 0;