commit db451484fadf4779e90b8ec7bfde2287078594f6
author Andrew Jeffery <andrew@aj.id.au> Wed Apr 13 16:53:22 2022 +0930
committer Ed Tanous <ed@tanous.net> Wed May 04 15:31:55 2022 +0000
tree 3ba062e72ade0e1f5b53c2bf6a151c9bb9bf6d3b
parent d60b147f019483e648f2418cc098e90b4d05e156

PerformScan: Extract pruneRecordExposes()

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

src/PerformScan.cpp

diff --git a/src/PerformScan.cpp b/src/PerformScan.cpp
index eee185a..e26ca5e 100644
--- a/src/PerformScan.cpp
+++ b/src/PerformScan.cpp
@@ -243,6 +243,25 @@
     _configurations(configurations), objServer(objServerIn),
     _callback(std::move(callback))
 {}
+
+static void pruneRecordExposes(nlohmann::json& fromLastJson)
+{
+    auto findExposes = fromLastJson.find("Exposes");
+    if (findExposes != fromLastJson.end())
+    {
+        auto copy = nlohmann::json::array();
+        for (auto& expose : *findExposes)
+        {
+            if (expose.is_null())
+            {
+                continue;
+            }
+            copy.emplace_back(expose);
+        }
+        *findExposes = copy;
+    }
+}
+
 void PerformScan::run()
 {
     boost::container::flat_set<std::string> dbusProbeInterfaces;
@@ -315,21 +334,7 @@
                     auto fromLastJson = lastJson.find(recordName);
                     if (fromLastJson != lastJson.end())
                     {
-                        auto findExposes = fromLastJson->find("Exposes");
-                        // delete nulls from any updates
-                        if (findExposes != fromLastJson->end())
-                        {
-                            auto copy = nlohmann::json::array();
-                            for (auto& expose : *findExposes)
-                            {
-                                if (expose.is_null())
-                                {
-                                    continue;
-                                }
-                                copy.emplace_back(expose);
-                            }
-                            *findExposes = copy;
-                        }
+                        pruneRecordExposes(*fromLastJson);
 
                         // keep user changes
                         _systemConfiguration[recordName] = *fromLastJson;