commit 5f070ff7b771e4c0f0260d8f14c1b5d518019fbe
author Andrew Jeffery <andrew@aj.id.au> Thu Dec 02 15:32:12 2021 +1030
committer Andrew Jeffery <andrew@aj.id.au> Tue Dec 07 04:06:13 2021 +0000
tree 2458f8f747d278f1358eed313cb2fd34890b697a
parent 84dfb54add363db623e9f69613c4881f3b4260cf

NVMeSensorMain: Collapse continue conditions

Reduce the verbosity of the loop implementation by testing everything at
once.

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

src/NVMeSensorMain.cpp

diff --git a/src/NVMeSensorMain.cpp b/src/NVMeSensorMain.cpp
index 2e29eaf..4f815ae 100644
--- a/src/NVMeSensorMain.cpp
+++ b/src/NVMeSensorMain.cpp
@@ -155,20 +155,11 @@
 
         std::optional<int> busNumber =
             extractBusNumber(sensor.first, baseConfiguration->second);
-        if (!busNumber)
-        {
-            continue;
-        }
-
         std::optional<std::string> sensorName =
             extractSensorName(sensor.first, baseConfiguration->second);
-        if (!sensorName)
-        {
-            continue;
-        }
-
         std::optional<int> rootBus = deriveRootBus(busNumber);
-        if (!rootBus)
+
+        if (!(busNumber && sensorName && rootBus))
         {
             continue;
         }