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/usercommands.cpp b/user_channel/usercommands.cpp
index 4ea8c4b..6467e45 100644
--- a/user_channel/usercommands.cpp
+++ b/user_channel/usercommands.cpp
@@ -24,6 +24,7 @@
#include <ipmid/api.hpp>
#include <phosphor-logging/log.hpp>
+
#include <regex>
namespace ipmi
@@ -67,8 +68,8 @@
return ipmi::responseInvalidFieldRequest();
}
- uint8_t chNum =
- convertCurrentChannelNum(static_cast<uint8_t>(channel), ctx->channel);
+ uint8_t chNum = convertCurrentChannelNum(static_cast<uint8_t>(channel),
+ ctx->channel);
if (!isValidChannel(chNum))
{
log<level::DEBUG>("Set user access - Invalid channel request");
@@ -138,8 +139,8 @@
uint6_t userId, uint2_t reserved2)
{
- uint8_t chNum =
- convertCurrentChannelNum(static_cast<uint8_t>(channel), ctx->channel);
+ uint8_t chNum = convertCurrentChannelNum(static_cast<uint8_t>(channel),
+ ctx->channel);
if (reserved1 || reserved2 || !isValidChannel(chNum))
{
@@ -167,8 +168,8 @@
}
bool enabledState = false;
- retStatus =
- ipmiUserCheckEnabled(static_cast<uint8_t>(userId), enabledState);
+ retStatus = ipmiUserCheckEnabled(static_cast<uint8_t>(userId),
+ enabledState);
if (retStatus != ccSuccess)
{
return ipmi::response(retStatus);
@@ -318,8 +319,8 @@
}
else if (operation == opEnableUser || operation == opDisableUser)
{
- ipmi::Cc res =
- ipmiUserUpdateEnabledState(userId, static_cast<bool>(operation));
+ ipmi::Cc res = ipmiUserUpdateEnabledState(userId,
+ static_cast<bool>(operation));
return ipmi::response(res);
}
else if (operation == opTestPassword)
@@ -410,8 +411,8 @@
uint4_t privLevel,
uint4_t reserved2)
{
- uint8_t channel =
- convertCurrentChannelNum(static_cast<uint8_t>(chNum), ctx->channel);
+ uint8_t channel = convertCurrentChannelNum(static_cast<uint8_t>(chNum),
+ ctx->channel);
if (reserved1 || reserved2 || !isValidChannel(channel) ||
!isValidPrivLimit(static_cast<uint8_t>(privLevel)))
@@ -430,16 +431,16 @@
constexpr bool extDataSupport = true; // true for IPMI 2.0 extensions
constexpr bool reserved3 = false;
- constexpr uint6_t rmcpAuthTypes = 0; // IPMI 1.5 auth types - not supported
+ constexpr uint6_t rmcpAuthTypes = 0; // IPMI 1.5 auth types - not supported
constexpr uint2_t reserved4 = 0;
- constexpr bool KGStatus = false; // Not supporting now.
+ constexpr bool KGStatus = false; // Not supporting now.
constexpr bool perMessageAuth = false; // Per message auth - enabled
constexpr bool userAuth = false; // User authentication - enabled
constexpr bool nullUsers = false; // Null user names - not supported
constexpr bool anonymousLogin = false; // Anonymous login - not supported
constexpr uint6_t reserved5 = 0;
- constexpr bool rmcpp = true; // IPMI 2.0 - supported
- constexpr bool rmcp = false; // IPMI 1.5 - not supported
+ constexpr bool rmcpp = true; // IPMI 2.0 - supported
+ constexpr bool rmcp = false; // IPMI 1.5 - not supported
constexpr uint24_t oemID = 0;
constexpr uint8_t oemAuxillary = 0;
@@ -499,8 +500,8 @@
uint8_t oemPayloadEnables2Reserved)
{
- auto chNum =
- convertCurrentChannelNum(static_cast<uint8_t>(channel), ctx->channel);
+ auto chNum = convertCurrentChannelNum(static_cast<uint8_t>(channel),
+ ctx->channel);
// Validate the reserved args. Only SOL payload is supported as on date.
if (reserved || stdPayload0ipmiReserved || stdPayload2 || stdPayload3 ||
stdPayload4 || stdPayload5 || stdPayload6 || stdPayload7 ||
@@ -566,27 +567,27 @@
* - oemPayloadEnables2Reserved - Reserved
*/
-ipmi::RspType<bool, // stdPayload0ipmiReserved
- bool, // stdPayload1SOL
- bool, // stdPayload2
- bool, // stdPayload3
- bool, // stdPayload4
- bool, // stdPayload5
- bool, // stdPayload6
- bool, // stdPayload7
+ipmi::RspType<bool, // stdPayload0ipmiReserved
+ bool, // stdPayload1SOL
+ bool, // stdPayload2
+ bool, // stdPayload3
+ bool, // stdPayload4
+ bool, // stdPayload5
+ bool, // stdPayload6
+ bool, // stdPayload7
uint8_t, // stdPayloadEnables2Reserved
- bool, // oemPayload0
- bool, // oemPayload1
- bool, // oemPayload2
- bool, // oemPayload3
- bool, // oemPayload4
- bool, // oemPayload5
- bool, // oemPayload6
- bool, // oemPayload7
+ bool, // oemPayload0
+ bool, // oemPayload1
+ bool, // oemPayload2
+ bool, // oemPayload3
+ bool, // oemPayload4
+ bool, // oemPayload5
+ bool, // oemPayload6
+ bool, // oemPayload7
- uint8_t // oemPayloadEnables2Reserved
+ uint8_t // oemPayloadEnables2Reserved
>
ipmiGetUserPayloadAccess(ipmi::Context::ptr ctx,
@@ -594,8 +595,8 @@
uint6_t userId, uint2_t reserved2)
{
- uint8_t chNum =
- convertCurrentChannelNum(static_cast<uint8_t>(channel), ctx->channel);
+ uint8_t chNum = convertCurrentChannelNum(static_cast<uint8_t>(channel),
+ ctx->channel);
if (reserved1 || reserved2 || !isValidChannel(chNum))
{