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/utils.cpp b/utils.cpp
index 225b1cc..06c26e8 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -4,6 +4,7 @@
#include <dirent.h>
#include <net/if.h>
+#include <algorithm>
#include <phosphor-logging/elog-errors.hpp>
#include <phosphor-logging/log.hpp>
#include <xyz/openbmc_project/Common/error.hpp>
@@ -74,25 +75,20 @@
}
// else search the match string in the object path
- auto objectFound = false;
- for (auto& object : objectTree)
- {
- if (object.first.find(match) != std::string::npos)
- {
- objectFound = true;
- objectInfo = make_pair(object.first,
- std::move(object.second.begin()->first));
- break;
- }
- }
+ auto found = std::find_if(
+ objectTree.begin(), objectTree.end(), [&match](const auto& object) {
+ return (object.first.find(match) != std::string::npos);
+ });
- if (!objectFound)
+ if (found == objectTree.end())
{
log<level::ERR>("Failed to find object which matches",
entry("MATCH=%s", match.c_str()));
elog<InternalFailure>();
+ // elog<> throws an exception.
}
- return objectInfo;
+
+ return make_pair(found->first, std::move(found->second.begin()->first));
}
DbusObjectInfo getIPObject(sdbusplus::bus::bus& bus,