diff options
author | Ed Tanous <ed@tanous.net> | 2020-10-07 21:41:22 +0300 |
---|---|---|
committer | Ed Tanous <ed@tanous.net> | 2020-10-09 20:22:02 +0300 |
commit | 3174e4dfd3185c131a07371b4b5a5b40cf0e0bdb (patch) | |
tree | 10d3d0cf46070704c775cb2bd2f190575aedd49e /redfish-core/lib/ethernet.hpp | |
parent | fc76b8ac6c2d9907ffd4618d22753db95c40953d (diff) | |
download | bmcweb-3174e4dfd3185c131a07371b4b5a5b40cf0e0bdb.tar.xz |
Write the clang-tidy file OpenBMC needs
Now that CI can handle clang-tidy, and a lot of the individual fixes
have landed for the various static analysis checks, lets see how close
we are.
This includes bringing a bunch of the code up to par with the checks
that require. Most of them fall into the category of extraneous else
statements, const correctness problems, or extra copies.
Tested:
CI only. Unit tests pass.
Signed-off-by: Ed Tanous <ed@tanous.net>
Change-Id: I9fbd346560a75fdd3901fa40c57932486275e912
Diffstat (limited to 'redfish-core/lib/ethernet.hpp')
-rw-r--r-- | redfish-core/lib/ethernet.hpp | 42 |
1 files changed, 12 insertions, 30 deletions
diff --git a/redfish-core/lib/ethernet.hpp b/redfish-core/lib/ethernet.hpp index 3494ede8c7..1fb8783d20 100644 --- a/redfish-core/lib/ethernet.hpp +++ b/redfish-core/lib/ethernet.hpp @@ -158,11 +158,11 @@ inline std::string getDhcpEnabledEnumeration(bool isIPv4, bool isIPv6) { return "xyz.openbmc_project.Network.EthernetInterface.DHCPConf.both"; } - else if (isIPv4) + if (isIPv4) { return "xyz.openbmc_project.Network.EthernetInterface.DHCPConf.v4"; } - else if (isIPv6) + if (isIPv6) { return "xyz.openbmc_project.Network.EthernetInterface.DHCPConf.v6"; } @@ -183,10 +183,7 @@ inline std::string { return "IPv4LinkLocal"; } - else - { - return "LinkLocal"; - } + return "LinkLocal"; } if (inputOrigin == "xyz.openbmc_project.Network.IP.AddressOrigin.DHCP") { @@ -194,10 +191,7 @@ inline std::string { return "DHCP"; } - else - { - return "DHCPv6"; - } + return "DHCPv6"; } if (inputOrigin == "xyz.openbmc_project.Network.IP.AddressOrigin.SLAAC") { @@ -678,10 +672,7 @@ inline bool ipv4VerifyIpAndGetBitcount(const std::string& ip, // Continuity not preserved return false; } - else - { - (*bits)++; - } + (*bits)++; } else { @@ -1567,12 +1558,9 @@ class EthernetInterface : public Node messages::resourceCannotBeDeleted(asyncResp->res); return; } - else - { - messages::propertyValueFormatError( - asyncResp->res, thisJson.dump(), pathString); - return; - } + messages::propertyValueFormatError( + asyncResp->res, thisJson.dump(), pathString); + return; } if (thisJson.is_null()) @@ -1704,12 +1692,9 @@ class EthernetInterface : public Node messages::resourceCannotBeDeleted(asyncResp->res); return; } - else - { - messages::propertyValueFormatError( - asyncResp->res, thisJson.dump(), pathString); - return; - } + messages::propertyValueFormatError( + asyncResp->res, thisJson.dump(), pathString); + return; } if (thisJson.is_null()) @@ -2099,10 +2084,7 @@ class VlanNetworkInterface : public Node { return false; } - else - { - return true; - } + return true; } /** |