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: I16de1731b6a2549fb11ca4115a9e477001c1f403
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/.clang-format b/.clang-format
index d43e884..28e3328 100644
--- a/.clang-format
+++ b/.clang-format
@@ -87,7 +87,7 @@
IndentWrappedFunctionNames: true
InsertNewlineAtEOF: true
KeepEmptyLinesAtTheStartOfBlocks: false
-LambdaBodyIndentation: OuterScope
+LambdaBodyIndentation: Signature
LineEnding: LF
MacroBlockBegin: ''
MacroBlockEnd: ''
@@ -98,13 +98,14 @@
ObjCSpaceBeforeProtocolList: true
PackConstructorInitializers: BinPack
PenaltyBreakAssignment: 25
-PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakBeforeFirstCallParameter: 50
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 60
-PenaltyIndentedWhitespace: 0
+PenaltyIndentedWhitespace: 1
PointerAlignment: Left
QualifierAlignment: Left
ReferenceAlignment: Left
diff --git a/src/manager.cpp b/src/manager.cpp
index cccd433..3cb96f5 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -312,8 +312,8 @@
Manager::Manager(sdbusplus::asio::object_server& objectServer,
std::shared_ptr<sdbusplus::asio::connection>& systemBus) :
- sdbusplus::xyz::openbmc_project::BIOSConfig::server::Manager(*systemBus,
- objectPath),
+ sdbusplus::xyz::openbmc_project::BIOSConfig::server::Manager(
+ *systemBus, objectPath),
objServer(objectServer), systemBus(systemBus)
{
fs::path biosDir(BIOS_PERSIST_PATH);
diff --git a/src/password.cpp b/src/password.cpp
index 0e348ce..c5d9d6e 100644
--- a/src/password.cpp
+++ b/src/password.cpp
@@ -120,10 +120,9 @@
return true;
}
-bool Password::verifyIntegrityCheck(std::string& newPassword,
- std::array<uint8_t, maxSeedSize>& seed,
- unsigned int mdLen,
- const EVP_MD* digestFunc)
+bool Password::verifyIntegrityCheck(
+ std::string& newPassword, std::array<uint8_t, maxSeedSize>& seed,
+ unsigned int mdLen, const EVP_MD* digestFunc)
{
mNewPwdHash.fill(0);