clang-format: re-format for clang-18
clang-format-18 isn't compatible with the clang-format-17 output, so we
need to reformat the code with the latest version. The way clang-18
handles lambda formatting also changed, so we have made changes to the
organization default style format to better handle lambda formatting.
See I5e08687e696dd240402a2780158664b7113def0e for updated style.
See Iea0776aaa7edd483fa395e23de25ebf5a6288f71 for clang-18 enablement.
Change-Id: I01547e98d27910919e09ebf7907c86292a6c825d
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/transporthandler.hpp b/transporthandler.hpp
index 165eeda..a2137cd 100644
--- a/transporthandler.hpp
+++ b/transporthandler.hpp
@@ -65,8 +65,8 @@
* @param[in] channel - The channel id corresponding to an ethernet interface
* @return Ethernet interface service and object path if it exists
*/
-std::optional<ChannelParams> maybeGetChannelParams(sdbusplus::bus_t& bus,
- uint8_t channel);
+std::optional<ChannelParams>
+ maybeGetChannelParams(sdbusplus::bus_t& bus, uint8_t channel);
/** @brief A trivial helper around maybeGetChannelParams() that throws an
* exception when it is unable to acquire parameters for the channel.
@@ -172,8 +172,7 @@
*/
ObjectLookupCache(sdbusplus::bus_t& bus, const ChannelParams& params,
const char* intf) :
- bus(bus),
- params(params), intf(intf),
+ bus(bus), params(params), intf(intf),
objs(getAllDbusObjects(bus, params.logicalPath, intf, ""))
{}
@@ -349,10 +348,9 @@
}
template <int family>
-std::optional<IfNeigh<family>>
- findStaticNeighbor(sdbusplus::bus_t&, const ChannelParams&,
- typename AddrFamily<family>::addr ip,
- ObjectLookupCache& neighbors)
+std::optional<IfNeigh<family>> findStaticNeighbor(
+ sdbusplus::bus_t&, const ChannelParams&,
+ typename AddrFamily<family>::addr ip, ObjectLookupCache& neighbors)
{
using sdbusplus::server::xyz::openbmc_project::network::Neighbor;
const auto state =
@@ -395,9 +393,9 @@
typename AddrFamily<family>::addr address,
stdplus::EtherAddr mac)
{
- auto newreq = bus.new_method_call(params.service.c_str(),
- params.logicalPath.c_str(),
- INTF_NEIGHBOR_CREATE_STATIC, "Neighbor");
+ auto newreq =
+ bus.new_method_call(params.service.c_str(), params.logicalPath.c_str(),
+ INTF_NEIGHBOR_CREATE_STATIC, "Neighbor");
stdplus::ToStrHandle<stdplus::ToStr<stdplus::EtherAddr>> macToStr;
stdplus::ToStrHandle<stdplus::ToStr<typename AddrFamily<family>::addr>>
addrToStr;