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/user_mgmt.cpp b/user_channel/user_mgmt.cpp
index 979aaa6..81e409e 100644
--- a/user_channel/user_mgmt.cpp
+++ b/user_channel/user_mgmt.cpp
@@ -158,9 +158,9 @@
{
try
{
- auto method = bus.new_method_call(service.c_str(), objPath.c_str(),
- dBusPropertiesInterface,
- setPropertiesMethod);
+ auto method =
+ bus.new_method_call(service.c_str(), objPath.c_str(),
+ dBusPropertiesInterface, setPropertiesMethod);
method.append(interface, property, value);
bus.call(method);
}
@@ -182,8 +182,8 @@
{
try
{
- userMgmtService = ipmi::getUserService(bus, userMgrInterface,
- userMgrObjBasePath);
+ userMgmtService =
+ ipmi::getUserService(bus, userMgrInterface, userMgrObjBasePath);
}
catch (const sdbusplus::exception_t& e)
{
@@ -653,8 +653,8 @@
return PAM_BUF_ERR;
}
- void* ptr = calloc(static_cast<size_t>(numMsg),
- sizeof(struct pam_response));
+ void* ptr =
+ calloc(static_cast<size_t>(numMsg), sizeof(struct pam_response));
if (ptr == nullptr)
{
free(pass);
@@ -687,8 +687,8 @@
const_cast<char*>(password)};
pam_handle_t* localAuthHandle = NULL; // this gets set by pam_start
- int retval = pam_start("passwd", username, &localConversation,
- &localAuthHandle);
+ int retval =
+ pam_start("passwd", username, &localConversation, &localAuthHandle);
if (retval != PAM_SUCCESS)
{
@@ -831,10 +831,9 @@
return ccSuccess;
}
-Cc UserAccess::setUserPayloadAccess(const uint8_t chNum,
- const uint8_t operation,
- const uint8_t userId,
- const PayloadAccess& payloadAccess)
+Cc UserAccess::setUserPayloadAccess(
+ const uint8_t chNum, const uint8_t operation, const uint8_t userId,
+ const PayloadAccess& payloadAccess)
{
constexpr uint8_t enable = 0x0;
constexpr uint8_t disable = 0x1;
@@ -1390,8 +1389,8 @@
readPayloadAccessFromUserInfo(usersTbl.user[usrIndex], stdPayload,
oemPayload);
- Json jsonPayloadEnabledInfo = constructJsonPayloadEnables(stdPayload,
- oemPayload);
+ Json jsonPayloadEnabledInfo =
+ constructJsonPayloadEnables(stdPayload, oemPayload);
jsonUserInfo[payloadEnabledStr] = jsonPayloadEnabledInfo;
jsonUsersTbl.push_back(jsonUserInfo);
@@ -1652,16 +1651,16 @@
sdbusplus::bus::match::rules::interface(dBusObjManager) +
sdbusplus::bus::match::rules::path(userMgrObjBasePath),
[&](sdbusplus::message_t& msg) {
- userUpdatedSignalHandler(*this, msg);
- });
+ userUpdatedSignalHandler(*this, msg);
+ });
userMgrRenamedSignal = std::make_unique<sdbusplus::bus::match_t>(
bus,
sdbusplus::bus::match::rules::type::signal() +
sdbusplus::bus::match::rules::interface(userMgrInterface) +
sdbusplus::bus::match::rules::path(userMgrObjBasePath),
[&](sdbusplus::message_t& msg) {
- userUpdatedSignalHandler(*this, msg);
- });
+ userUpdatedSignalHandler(*this, msg);
+ });
userPropertiesSignal = std::make_unique<sdbusplus::bus::match_t>(
bus,
sdbusplus::bus::match::rules::type::signal() +
@@ -1671,8 +1670,8 @@
sdbusplus::bus::match::rules::member(propertiesChangedSignal) +
sdbusplus::bus::match::rules::argN(0, usersInterface),
[&](sdbusplus::message_t& msg) {
- userUpdatedSignalHandler(*this, msg);
- });
+ userUpdatedSignalHandler(*this, msg);
+ });
signalHndlrObject = true;
}
std::map<DbusUserObjPath, DbusUserObjValue> managedObjs;