lint: update .clant-format and run
Change-Id: If9cfc42ca96517a4df2c59c130c2e22a2a443467
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/.clang-format b/.clang-format
index 00e2e25..5f0cb09 100644
--- a/.clang-format
+++ b/.clang-format
@@ -6,12 +6,12 @@
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
AlignEscapedNewlines: Right
-AlignOperands: true
+AlignOperands: Align
AlignTrailingComments: true
AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: false
+AllowShortBlocksOnASingleLine: Empty
AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: None
+AllowShortFunctionsOnASingleLine: Empty
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterReturnType: None
@@ -75,6 +75,7 @@
- Regex: '.*'
Priority: 6
IndentCaseLabels: true
+IndentRequiresClause: true
IndentWidth: 4
IndentWrappedFunctionNames: true
KeepEmptyLinesAtTheStartOfBlocks: false
@@ -85,13 +86,18 @@
ObjCBlockIndentWidth: 2
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 25
PenaltyBreakBeforeFirstCallParameter: 19
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
PenaltyBreakString: 1000
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 60
+PenaltyIndentedWhitespace: 0
+QualifierAlignment: Left
+ReferenceAlignment: Left
ReflowComments: true
+RequiresClausePosition: OwnLine
SortIncludes: true
SortUsingDeclarations: true
SpaceAfterCStyleCast: false
diff --git a/fail-monitor/monitor.cpp b/fail-monitor/monitor.cpp
index 2c4beb7..2c3b31d 100644
--- a/fail-monitor/monitor.cpp
+++ b/fail-monitor/monitor.cpp
@@ -93,8 +93,8 @@
void Monitor::runTargetAction()
{
// Start or stop the target unit
- const auto* methodCall =
- (action == Action::start) ? startMethod : stopMethod;
+ const auto* methodCall = (action == Action::start) ? startMethod
+ : stopMethod;
log<level::INFO>("The source unit is in failed state, "
"running target action",
diff --git a/src/test/interfaces_added.cpp b/src/test/interfaces_added.cpp
index 63a6a26..4446e23 100644
--- a/src/test/interfaces_added.cpp
+++ b/src/test/interfaces_added.cpp
@@ -34,8 +34,8 @@
auto interfaceMap = createDefaultInterfaceMap();
AssociationMaps assocMaps;
- auto intfAdded =
- createInterfacesAdded(assocDefsInterface, assocDefsProperty);
+ auto intfAdded = createInterfacesAdded(assocDefsInterface,
+ assocDefsProperty);
boost::asio::io_context io;