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/user_channel/channel_mgmt.cpp b/user_channel/channel_mgmt.cpp
index 13ea55b..ed95271 100644
--- a/user_channel/channel_mgmt.cpp
+++ b/user_channel/channel_mgmt.cpp
@@ -346,12 +346,12 @@
dBusPropertiesInterface) +
sdbusplus::bus::match::rules::argN(0, networkChConfigIntfName),
[&](sdbusplus::message_t& msg) {
- DbusChObjProperties props;
- std::string iface;
- std::string path = msg.get_path();
- msg.read(iface, props);
- processChAccessPropChange(path, props);
- });
+ DbusChObjProperties props;
+ std::string iface;
+ std::string path = msg.get_path();
+ msg.read(iface, props);
+ processChAccessPropChange(path, props);
+ });
signalHndlrObjectState = true;
chInterfaceAddedSignal = std::make_unique<sdbusplus::bus::match_t>(
@@ -676,9 +676,8 @@
return ccSuccess;
}
-Cc ChannelConfig::getChannelEnabledAuthType(const uint8_t chNum,
- const uint8_t priv,
- EAuthType& authType)
+Cc ChannelConfig::getChannelEnabledAuthType(
+ const uint8_t chNum, const uint8_t priv, EAuthType& authType)
{
if (!isValidChannel(chNum))
{
@@ -767,8 +766,8 @@
EChannelSessSupported
ChannelConfig::convertToSessionSupportIndex(const std::string& value)
{
- auto iter = std::find(sessionSupportList.begin(), sessionSupportList.end(),
- value);
+ auto iter =
+ std::find(sessionSupportList.begin(), sessionSupportList.end(), value);
if (iter == sessionSupportList.end())
{
lg2::error("Invalid session supported: {SESS_STR}", "SESS_STR", value);
@@ -972,8 +971,8 @@
chData.isChValid = channelFound &&
jsonChData[isValidString].get<bool>();
chData.activeSessCount = jsonChData.value(activeSessionsString, 0);
- chData.maxTransferSize = jsonChData.value(maxTransferSizeString,
- smallChannelSize);
+ chData.maxTransferSize =
+ jsonChData.value(maxTransferSizeString, smallChannelSize);
if (jsonChData.count(isManagementNIC) != 0)
{
chData.isManagementNIC =
@@ -1287,17 +1286,16 @@
return ret;
}
-int ChannelConfig::setDbusProperty(const std::string& service,
- const std::string& objPath,
- const std::string& interface,
- const std::string& property,
- const DbusVariant& value)
+int ChannelConfig::setDbusProperty(
+ const std::string& service, const std::string& objPath,
+ const std::string& interface, const std::string& property,
+ const DbusVariant& value)
{
try
{
- auto method = bus.new_method_call(service.c_str(), objPath.c_str(),
- "org.freedesktop.DBus.Properties",
- "Set");
+ auto method =
+ bus.new_method_call(service.c_str(), objPath.c_str(),
+ "org.freedesktop.DBus.Properties", "Set");
method.append(interface, property, value);