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: Ic2b241b0a752b9d36abdd37e87d9b2047e1211ca
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/bmc_epoch.hpp b/bmc_epoch.hpp
index 29748a6..3e358b7 100644
--- a/bmc_epoch.hpp
+++ b/bmc_epoch.hpp
@@ -99,11 +99,11 @@
/** @brief The deleter of sd_event_source */
std::function<void(sd_event_source*)> sdEventSourceDeleter =
[](sd_event_source* p) {
- if (p)
- {
- sd_event_source_unref(p);
- }
- };
+ if (p)
+ {
+ sd_event_source_unref(p);
+ }
+ };
using SdEventSource =
std::unique_ptr<sd_event_source, decltype(sdEventSourceDeleter)>;
diff --git a/manager.cpp b/manager.cpp
index c59c174..631a2da 100644
--- a/manager.cpp
+++ b/manager.cpp
@@ -105,8 +105,8 @@
bool oldNtpMode = (Mode::NTP == getTimeMode());
if (newNtpMode != oldNtpMode)
{
- const auto& timeMode = newNtpMode ? settings::ntpSync
- : settings::manualSync;
+ const auto& timeMode =
+ newNtpMode ? settings::ntpSync : settings::manualSync;
std::string settingManager = utils::getService(
bus, settings.timeSyncMethod.c_str(), settings::timeSyncIntf);
utils::setProperty(bus, settingManager, settings.timeSyncMethod,