cleanup: transition to find_if
[utils.cpp:81]: (style) Consider using std::find_if algorithm instead
of a raw loop.
[storageaddsel.cpp:170]: (style) Consider using std::find_if algorithm instead
of a raw loop.
Change-Id: I7ebbb6428fbbae9196912837d2ac9820420b77df
Signed-off-by: Patrick Venture <venture@google.com>
diff --git a/storageaddsel.cpp b/storageaddsel.cpp
index 41f813c..4ed22fc 100644
--- a/storageaddsel.cpp
+++ b/storageaddsel.cpp
@@ -151,11 +151,9 @@
int create_esel_association(const uint8_t* buffer, std::string& inventoryPath)
{
- uint8_t sensor;
-
auto p = reinterpret_cast<const ipmi_add_sel_request_t*>(buffer);
- sensor = p->sensornumber;
+ uint8_t sensor = p->sensornumber;
inventoryPath = {};
@@ -163,13 +161,13 @@
* Search the sensor number to inventory path mapping to figure out the
* inventory associated with the ESEL.
*/
- for (auto const& iter : invSensors)
+ auto found = std::find_if(invSensors.begin(), invSensors.end(),
+ [&sensor](const auto& iter) {
+ return (iter.second.sensorID == sensor);
+ });
+ if (found != invSensors.end())
{
- if (iter.second.sensorID == sensor)
- {
- inventoryPath = iter.first;
- break;
- }
+ inventoryPath = found->first;
}
return 0;