diff options
| author | Ed Tanous <ed@tanous.net> | 2020-12-18 03:41:31 +0300 |
|---|---|---|
| committer | Ed Tanous <ed@tanous.net> | 2021-02-19 20:51:28 +0300 |
| commit | 2dfd18ef79d3b0a2995ba731983479d492be5949 (patch) | |
| tree | dec1bda8ae27cbee65a983929b994515957beb3c /redfish-core/lib/ethernet.hpp | |
| parent | cb2ed190a7890e7ec3e6f5bde74e4d0abdee4bd1 (diff) | |
| download | bmcweb-2dfd18ef79d3b0a2995ba731983479d492be5949.tar.xz | |
Start using sdbusplus::message::filename()
Lots of code gets checked in that does this path checking incorrectly.
So much so, that we have it documented in COMMON_ERRORS.md, yet, we
persist. This patchset starts using the new object_path::filename()
method that was added recently to sdbusplus. Overall, it deletes code,
and makes for a much better developer experience.
Tested:
Pulled down several endpoints and verified that filename() method works
properly, and the collections are returned as expected.
curl -vvvv --insecure --user root:0penBmc https://192.168.7.2/redfish/v1/AccountService/Accounts
Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: Ief1e0584394fb139678d3453265f7011bc931f3c
Diffstat (limited to 'redfish-core/lib/ethernet.hpp')
| -rw-r--r-- | redfish-core/lib/ethernet.hpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/redfish-core/lib/ethernet.hpp b/redfish-core/lib/ethernet.hpp index e73d338ac3..159eda2433 100644 --- a/redfish-core/lib/ethernet.hpp +++ b/redfish-core/lib/ethernet.hpp @@ -968,14 +968,13 @@ void getEthernetIfaceList(CallbackFunc&& callback) if (interface.first == "xyz.openbmc_project.Network.EthernetInterface") { - // Cut out everything until last "/", ... - const std::string& ifaceId = objpath.first.str; - std::size_t lastPos = ifaceId.rfind('/'); - if (lastPos != std::string::npos) + std::string ifaceId = objpath.first.filename(); + if (ifaceId.empty()) { - // and put it into output vector. - ifaceList.emplace(ifaceId.substr(lastPos + 1)); + continue; } + // and put it into output vector. + ifaceList.emplace(ifaceId); } } } |