clang-format: copy latest and re-format
clang-format-16 has some backwards incompatible changes that require
additional settings for best compatibility and re-running the formatter.
Copy the latest .clang-format from the docs repository and reformat the
repository.
Change-Id: Ia4966a0790437eb0fc011c747f3be2a52884e4d8
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/src/network_manager.cpp b/src/network_manager.cpp
index ffcae48..72e0d03 100644
--- a/src/network_manager.cpp
+++ b/src/network_manager.cpp
@@ -10,13 +10,14 @@
#include <linux/neighbour.h>
#include <net/if.h>
-#include <filesystem>
#include <phosphor-logging/elog-errors.hpp>
#include <phosphor-logging/lg2.hpp>
#include <sdbusplus/message.hpp>
#include <stdplus/pinned.hpp>
#include <xyz/openbmc_project/Common/error.hpp>
+#include <filesystem>
+
constexpr char SYSTEMD_BUSNAME[] = "org.freedesktop.systemd1";
constexpr char SYSTEMD_PATH[] = "/org/freedesktop/systemd1";
constexpr char SYSTEMD_INTERFACE[] = "org.freedesktop.systemd1.Manager";
@@ -48,31 +49,31 @@
systemdNetworkdEnabledMatch(
bus, enabledMatch,
[man = stdplus::PinnedRef(*this)](sdbusplus::message_t& m) {
- std::string intf;
- std::unordered_map<std::string, std::variant<std::string>> values;
- try
- {
- m.read(intf, values);
- auto it = values.find("AdministrativeState");
- if (it == values.end())
- {
- return;
- }
- const std::string_view obj = m.get_path();
- auto sep = obj.rfind('/');
- if (sep == obj.npos || sep + 3 > obj.size())
- {
- throw std::invalid_argument("Invalid obj path");
- }
- auto ifidx = DecodeInt<unsigned, 10>{}(obj.substr(sep + 3));
- const auto& state = std::get<std::string>(it->second);
- man.get().handleAdminState(state, ifidx);
- }
- catch (const std::exception& e)
- {
- lg2::error("AdministrativeState match parsing failed: {ERROR}",
- "ERROR", e);
- }
+ std::string intf;
+ std::unordered_map<std::string, std::variant<std::string>> values;
+ try
+ {
+ m.read(intf, values);
+ auto it = values.find("AdministrativeState");
+ if (it == values.end())
+ {
+ return;
+ }
+ const std::string_view obj = m.get_path();
+ auto sep = obj.rfind('/');
+ if (sep == obj.npos || sep + 3 > obj.size())
+ {
+ throw std::invalid_argument("Invalid obj path");
+ }
+ auto ifidx = DecodeInt<unsigned, 10>{}(obj.substr(sep + 3));
+ const auto& state = std::get<std::string>(it->second);
+ man.get().handleAdminState(state, ifidx);
+ }
+ catch (const std::exception& e)
+ {
+ lg2::error("AdministrativeState match parsing failed: {ERROR}", "ERROR",
+ e);
+ }
})
{
reload.setCallback([&]() {
@@ -360,38 +361,38 @@
{
std::visit(
[&](auto addr) {
- if constexpr (std::is_same_v<in_addr, decltype(addr)>)
- {
- it->second.defgw4.emplace(addr);
- }
- else if constexpr (std::is_same_v<in6_addr, decltype(addr)>)
- {
- it->second.defgw6.emplace(addr);
- }
- else
- {
- static_assert(!std::is_same_v<void, decltype(addr)>);
- }
+ if constexpr (std::is_same_v<in_addr, decltype(addr)>)
+ {
+ it->second.defgw4.emplace(addr);
+ }
+ else if constexpr (std::is_same_v<in6_addr, decltype(addr)>)
+ {
+ it->second.defgw6.emplace(addr);
+ }
+ else
+ {
+ static_assert(!std::is_same_v<void, decltype(addr)>);
+ }
},
addr);
if (auto it = interfacesByIdx.find(ifidx); it != interfacesByIdx.end())
{
std::visit(
[&](auto addr) {
- if constexpr (std::is_same_v<in_addr, decltype(addr)>)
- {
- it->second->EthernetInterfaceIntf::defaultGateway(
- std::to_string(addr));
- }
- else if constexpr (std::is_same_v<in6_addr, decltype(addr)>)
- {
- it->second->EthernetInterfaceIntf::defaultGateway6(
- std::to_string(addr));
- }
- else
- {
- static_assert(!std::is_same_v<void, decltype(addr)>);
- }
+ if constexpr (std::is_same_v<in_addr, decltype(addr)>)
+ {
+ it->second->EthernetInterfaceIntf::defaultGateway(
+ std::to_string(addr));
+ }
+ else if constexpr (std::is_same_v<in6_addr, decltype(addr)>)
+ {
+ it->second->EthernetInterfaceIntf::defaultGateway6(
+ std::to_string(addr));
+ }
+ else
+ {
+ static_assert(!std::is_same_v<void, decltype(addr)>);
+ }
},
addr);
}
@@ -408,52 +409,48 @@
{
std::visit(
[&](auto addr) {
- if constexpr (std::is_same_v<in_addr, decltype(addr)>)
+ if constexpr (std::is_same_v<in_addr, decltype(addr)>)
+ {
+ if (it->second.defgw4 == addr)
{
- if (it->second.defgw4 == addr)
- {
- it->second.defgw4.reset();
- }
+ it->second.defgw4.reset();
}
- else if constexpr (std::is_same_v<in6_addr, decltype(addr)>)
+ }
+ else if constexpr (std::is_same_v<in6_addr, decltype(addr)>)
+ {
+ if (it->second.defgw6 == addr)
{
- if (it->second.defgw6 == addr)
- {
- it->second.defgw6.reset();
- }
+ it->second.defgw6.reset();
}
- else
- {
- static_assert(!std::is_same_v<void, decltype(addr)>);
- }
+ }
+ else
+ {
+ static_assert(!std::is_same_v<void, decltype(addr)>);
+ }
},
addr);
if (auto it = interfacesByIdx.find(ifidx); it != interfacesByIdx.end())
{
std::visit(
[&](auto addr) {
- if constexpr (std::is_same_v<in_addr, decltype(addr)>)
+ if constexpr (std::is_same_v<in_addr, decltype(addr)>)
+ {
+ if (it->second->defaultGateway() == std::to_string(addr))
{
- if (it->second->defaultGateway() ==
- std::to_string(addr))
- {
- it->second->EthernetInterfaceIntf::defaultGateway(
- "");
- }
+ it->second->EthernetInterfaceIntf::defaultGateway("");
}
- else if constexpr (std::is_same_v<in6_addr, decltype(addr)>)
+ }
+ else if constexpr (std::is_same_v<in6_addr, decltype(addr)>)
+ {
+ if (it->second->defaultGateway6() == std::to_string(addr))
{
- if (it->second->defaultGateway6() ==
- std::to_string(addr))
- {
- it->second->EthernetInterfaceIntf::defaultGateway6(
- "");
- }
+ it->second->EthernetInterfaceIntf::defaultGateway6("");
}
- else
- {
- static_assert(!std::is_same_v<void, decltype(addr)>);
- }
+ }
+ else
+ {
+ static_assert(!std::is_same_v<void, decltype(addr)>);
+ }
},
addr);
}