Move and update clang-format
Use a single clang-format file at the root, so CI can find it, and
update it to the latest.
Change-Id: I07e1bf659466ee79e2215dba905226af04e23d32
Signed-off-by: Jason M. Bills <jason.m.bills@intel.com>
diff --git a/callback-manager/.clang-format b/callback-manager/.clang-format
deleted file mode 100644
index 625a0a0..0000000
--- a/callback-manager/.clang-format
+++ /dev/null
@@ -1,114 +0,0 @@
----
-Language: Cpp
-# BasedOnStyle: LLVM
-AccessModifierOffset: -2
-AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
-AlignEscapedNewlines: Right
-AlignOperands: true
-AlignTrailingComments: true
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: None
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: Yes
-BinPackArguments: true
-BinPackParameters: true
-BraceWrapping:
- AfterCaseLabel: true
- AfterClass: true
- AfterControlStatement: true
- AfterEnum: true
- AfterFunction: true
- AfterNamespace: true
- AfterObjCDeclaration: true
- AfterStruct: true
- AfterUnion: true
- AfterExternBlock: true
- BeforeCatch: true
- BeforeElse: true
- IndentBraces: false
- SplitEmptyFunction: false
- SplitEmptyRecord: false
- SplitEmptyNamespace: false
-BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Custom
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializers: AfterColon
-BreakInheritanceList: AfterColon
-BreakStringLiterals: true
-ColumnLimit: 80
-CommentPragmas: '^ IWYU pragma:'
-CompactNamespaces: false
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
-DerivePointerAlignment: false
-PointerAlignment: Left
-DisableFormat: false
-ExperimentalAutoDetectBinPacking: false
-FixNamespaceComments: true
-ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
-IncludeBlocks: Regroup
-IncludeCategories:
- - Regex: '^[<"](gtest|gmock)'
- Priority: 7
- - Regex: '^"config.h"'
- Priority: -1
- - Regex: '^".*\.h"'
- Priority: 1
- - Regex: '^".*\.hpp"'
- Priority: 2
- - Regex: '^<.*\.h>'
- Priority: 3
- - Regex: '^<.*\.hpp>'
- Priority: 4
- - Regex: '^<.*'
- Priority: 5
- - Regex: '.*'
- Priority: 6
-IndentCaseLabels: true
-IndentWidth: 4
-IndentWrappedFunctionNames: true
-KeepEmptyLinesAtTheStartOfBlocks: true
-MacroBlockBegin: ''
-MacroBlockEnd: ''
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: None
-ObjCBlockIndentWidth: 2
-ObjCSpaceAfterProperty: false
-ObjCSpaceBeforeProtocolList: true
-PenaltyBreakBeforeFirstCallParameter: 19
-PenaltyBreakComment: 300
-PenaltyBreakFirstLessLess: 120
-PenaltyBreakString: 1000
-PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 60
-ReflowComments: true
-SortIncludes: true
-SortUsingDeclarations: true
-SpaceAfterCStyleCast: false
-SpaceAfterTemplateKeyword: true
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeCpp11BracedList: false
-SpaceBeforeCtorInitializerColon: true
-SpaceBeforeInheritanceColon: true
-SpaceBeforeParens: ControlStatements
-SpaceBeforeRangeBasedForLoopColon: true
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
-SpacesInAngles: false
-SpacesInContainerLiterals: true
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-Standard: Latest
-TabWidth: 4
-UseTab: Never
-...
diff --git a/callback-manager/src/callback_manager.cpp b/callback-manager/src/callback_manager.cpp
index 9d67808..97f74f1 100644
--- a/callback-manager/src/callback_manager.cpp
+++ b/callback-manager/src/callback_manager.cpp
@@ -199,9 +199,9 @@
}
if constexpr (debug)
{
- std::cerr << "Set " << ledPair.first << " to "
- << std::boolalpha
- << std::get<bool>(ledPair.second) << "\n";
+ std::cerr
+ << "Set " << ledPair.first << " to " << std::boolalpha
+ << std::get<bool>(ledPair.second) << "\n";
}
},
ledManagerBusname, ledPair.first, "org.freedesktop.DBus.Properties",
@@ -211,7 +211,6 @@
void createThresholdMatch(std::shared_ptr<sdbusplus::asio::connection>& conn)
{
-
static sdbusplus::bus::match_t match(
static_cast<sdbusplus::bus_t&>(*conn),
"type='signal',member='ThresholdAsserted'",
@@ -361,8 +360,9 @@
std::shared_ptr<sdbusplus::asio::dbus_interface> rootIface =
objServer.add_interface(rootPath,
"xyz.openbmc_project.CallbackManager");
- rootIface->register_method("RetriggerLEDUpdate",
- [&conn]() { updateLedStatus(conn, true); });
+ rootIface->register_method("RetriggerLEDUpdate", [&conn]() {
+ updateLedStatus(conn, true);
+ });
rootIface->initialize();
std::shared_ptr<sdbusplus::asio::dbus_interface> inventoryIface =