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: I44441096113929ce96eb1439e2932e6ff3c87f27
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/user_channel/user_mgmt.cpp b/user_channel/user_mgmt.cpp
index 7ffee61..2e6e841 100644
--- a/user_channel/user_mgmt.cpp
+++ b/user_channel/user_mgmt.cpp
@@ -25,19 +25,20 @@
#include <boost/interprocess/sync/named_recursive_mutex.hpp>
#include <boost/interprocess/sync/scoped_lock.hpp>
-#include <cerrno>
-#include <fstream>
#include <ipmid/types.hpp>
#include <nlohmann/json.hpp>
#include <phosphor-logging/elog-errors.hpp>
#include <phosphor-logging/log.hpp>
-#include <regex>
#include <sdbusplus/bus/match.hpp>
#include <sdbusplus/server/object.hpp>
-#include <variant>
#include <xyz/openbmc_project/Common/error.hpp>
#include <xyz/openbmc_project/User/Common/error.hpp>
+#include <cerrno>
+#include <fstream>
+#include <regex>
+#include <variant>
+
namespace ipmi
{
@@ -158,9 +159,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 +183,8 @@
{
try
{
- userMgmtService =
- ipmi::getUserService(bus, userMgrInterface, userMgrObjBasePath);
+ userMgmtService = ipmi::getUserService(bus, userMgrInterface,
+ userMgrObjBasePath);
}
catch (const sdbusplus::exception_t& e)
{
@@ -656,8 +657,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);
@@ -690,8 +691,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)
{
@@ -1398,8 +1399,8 @@
readPayloadAccessFromUserInfo(usersTbl.user[usrIndex], stdPayload,
oemPayload);
- Json jsonPayloadEnabledInfo =
- constructJsonPayloadEnables(stdPayload, oemPayload);
+ Json jsonPayloadEnabledInfo = constructJsonPayloadEnables(stdPayload,
+ oemPayload);
jsonUserInfo[payloadEnabledStr] = jsonPayloadEnabledInfo;
jsonUsersTbl.push_back(jsonUserInfo);
@@ -1662,7 +1663,7 @@
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,
@@ -1670,7 +1671,7 @@
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,
@@ -1681,7 +1682,7 @@
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;
}
@@ -1738,8 +1739,8 @@
{
// Group "ipmi" is present so lets update other properties
// in IPMI
- uint8_t priv =
- UserAccess::convertToIPMIPrivilege(usrPriv) & privMask;
+ uint8_t priv = UserAccess::convertToIPMIPrivilege(usrPriv) &
+ privMask;
// Update all channels priv, only if it is not equivalent to
// getUsrMgmtSyncIndex()
if (userData->user[usrIdx]