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/usercommands.cpp b/user_channel/usercommands.cpp
index 53b34f8..cc7174f 100644
--- a/user_channel/usercommands.cpp
+++ b/user_channel/usercommands.cpp
@@ -48,15 +48,15 @@
*
* @returns ipmi completion code
*/
-ipmi::RspType<> ipmiSetUserAccess(ipmi::Context::ptr ctx, uint4_t channel,
- uint1_t ipmiEnabled, uint1_t linkAuthEnabled,
- uint1_t accessCallback, uint1_t bitsUpdate,
+ipmi::RspType<> ipmiSetUserAccess(
+ ipmi::Context::ptr ctx, uint4_t channel, uint1_t ipmiEnabled,
+ uint1_t linkAuthEnabled, uint1_t accessCallback, uint1_t bitsUpdate,
- uint6_t userId, uint2_t reserved1,
+ uint6_t userId, uint2_t reserved1,
- uint4_t privilege, uint4_t reserved2,
+ uint4_t privilege, uint4_t reserved2,
- std::optional<uint8_t> sessionLimit)
+ std::optional<uint8_t> sessionLimit)
{
uint8_t sessLimit = sessionLimit.value_or(0);
if (reserved1 || reserved2 || sessLimit ||
@@ -66,8 +66,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))
{
lg2::debug("Set user access - Invalid channel request");
@@ -137,8 +137,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))
{
@@ -166,8 +166,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);
@@ -205,10 +205,9 @@
* @returns ipmi response
*/
-ipmi::RspType<>
- ipmiSetUserName([[maybe_unused]] ipmi::Context::ptr ctx, uint6_t id,
- uint2_t reserved,
- const std::array<uint8_t, ipmi::ipmiMaxUserName>& name)
+ipmi::RspType<> ipmiSetUserName(
+ [[maybe_unused]] ipmi::Context::ptr ctx, uint6_t id, uint2_t reserved,
+ const std::array<uint8_t, ipmi::ipmiMaxUserName>& name)
{
if (reserved)
{
@@ -319,8 +318,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)
@@ -405,14 +404,12 @@
uint24_t, // oemID
uint8_t // oemAuxillary
>
- ipmiGetChannelAuthenticationCapabilities(ipmi::Context::ptr ctx,
- uint4_t chNum, uint3_t reserved1,
- [[maybe_unused]] bool extData,
- uint4_t privLevel,
- uint4_t reserved2)
+ ipmiGetChannelAuthenticationCapabilities(
+ ipmi::Context::ptr ctx, uint4_t chNum, uint3_t reserved1,
+ [[maybe_unused]] bool extData, 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)))
@@ -498,8 +495,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 ||
@@ -593,8 +590,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))
{
@@ -618,27 +615,28 @@
return ipmi::response(retStatus);
}
constexpr uint8_t res8bits = 0;
- return ipmi::responseSuccess(payloadAccess.stdPayloadEnables1.test(0),
- payloadAccess.stdPayloadEnables1.test(1),
- payloadAccess.stdPayloadEnables1.test(2),
- payloadAccess.stdPayloadEnables1.test(3),
- payloadAccess.stdPayloadEnables1.test(4),
- payloadAccess.stdPayloadEnables1.test(5),
- payloadAccess.stdPayloadEnables1.test(6),
- payloadAccess.stdPayloadEnables1.test(7),
+ return ipmi::responseSuccess(
+ payloadAccess.stdPayloadEnables1.test(0),
+ payloadAccess.stdPayloadEnables1.test(1),
+ payloadAccess.stdPayloadEnables1.test(2),
+ payloadAccess.stdPayloadEnables1.test(3),
+ payloadAccess.stdPayloadEnables1.test(4),
+ payloadAccess.stdPayloadEnables1.test(5),
+ payloadAccess.stdPayloadEnables1.test(6),
+ payloadAccess.stdPayloadEnables1.test(7),
- res8bits,
+ res8bits,
- payloadAccess.oemPayloadEnables1.test(0),
- payloadAccess.oemPayloadEnables1.test(1),
- payloadAccess.oemPayloadEnables1.test(2),
- payloadAccess.oemPayloadEnables1.test(3),
- payloadAccess.oemPayloadEnables1.test(4),
- payloadAccess.oemPayloadEnables1.test(5),
- payloadAccess.oemPayloadEnables1.test(6),
- payloadAccess.oemPayloadEnables1.test(7),
+ payloadAccess.oemPayloadEnables1.test(0),
+ payloadAccess.oemPayloadEnables1.test(1),
+ payloadAccess.oemPayloadEnables1.test(2),
+ payloadAccess.oemPayloadEnables1.test(3),
+ payloadAccess.oemPayloadEnables1.test(4),
+ payloadAccess.oemPayloadEnables1.test(5),
+ payloadAccess.oemPayloadEnables1.test(6),
+ payloadAccess.oemPayloadEnables1.test(7),
- res8bits);
+ res8bits);
}
void registerUserIpmiFunctions() __attribute__((constructor));