commit b620944d46b5b8eb2760624ffc93a7e4323222f6
author Andrew Jeffery <andrew@aj.id.au> Thu Mar 24 12:36:20 2022 +1030
committer Andrew Jeffery <andrew@aj.id.au> Tue Mar 29 13:52:05 2022 +1030
tree 53848a3fed0b6baabbaa6420b6aa1dc0d6a34586
parent 55192934da4341ad5b3fad14c096f11950200159

EntityManager: Refactor deviceRequiresPowerOn() with early-exits

Make the state space easier to follow.

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

src/EntityManager.cpp

diff --git a/src/EntityManager.cpp b/src/EntityManager.cpp
index 0472612..e122fd3 100644
--- a/src/EntityManager.cpp
+++ b/src/EntityManager.cpp
@@ -838,19 +838,18 @@
 static bool deviceRequiresPowerOn(const nlohmann::json& entity)
 {
     auto powerState = entity.find("PowerState");
-    if (powerState != entity.end())
+    if (powerState == entity.end())
     {
-        auto ptr = powerState->get_ptr<const std::string*>();
-        if (ptr)
-        {
-            if (*ptr == "On" || *ptr == "BiosPost")
-            {
-                return true;
-            }
-        }
+        return false;
     }
 
-    return false;
+    auto ptr = powerState->get_ptr<const std::string*>();
+    if (!ptr)
+    {
+        return false;
+    }
+
+    return *ptr == "On" || *ptr == "BiosPost";
 }
 
 void startRemovedTimer(boost::asio::steady_timer& timer,