Skip to content

Commit b6d3e2f

Browse files
clang-format: re-format for clang-19
clang-format-19 isn't compatible with the clang-format-18 output, so we need to reformat the code with the latest version. A few parameters in clang-tidy have been deprecated, so adjust the style file accordingly. See Ie2f6eb3b043f2d655c9df806815afd7971fd0947 for updated style. See I88192b41ab7a95599a90915013579608af7bc56f for clang-19 enablement. Change-Id: I754b2a89844754c9d87ca20a829cce32dd7feb51 Signed-off-by: Patrick Williams <[email protected]>
1 parent ea6d9c4 commit b6d3e2f

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

Diff for: .clang-format

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ AllowShortFunctionsOnASingleLine: Empty
1717
AllowShortIfStatementsOnASingleLine: Never
1818
AllowShortLambdasOnASingleLine: true
1919
AllowShortLoopsOnASingleLine: false
20-
AlwaysBreakAfterReturnType: None
2120
AlwaysBreakBeforeMultilineStrings: false
22-
AlwaysBreakTemplateDeclarations: Yes
2321
BinPackArguments: true
2422
BinPackParameters: true
2523
BitFieldColonSpacing: None
@@ -43,12 +41,14 @@ BraceWrapping:
4341
SplitEmptyRecord: false
4442
SplitEmptyNamespace: false
4543
BreakAfterAttributes: Never
44+
BreakAfterReturnType: Automatic
4645
BreakBeforeBinaryOperators: None
4746
BreakBeforeBraces: Custom
4847
BreakBeforeTernaryOperators: true
4948
BreakConstructorInitializers: AfterColon
5049
BreakInheritanceList: AfterColon
5150
BreakStringLiterals: false
51+
BreakTemplateDeclarations: Yes
5252
ColumnLimit: 80
5353
CommentPragmas: '^ IWYU pragma:'
5454
CompactNamespaces: false

Diff for: extensions/openpower-pels/manager.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1004,8 +1004,8 @@ uint32_t Manager::getBMCLogIdFromPELId(uint32_t pelId)
10041004
}
10051005
}
10061006

1007-
void Manager::updateProgressSRC(
1008-
std::unique_ptr<openpower::pels::PEL>& pel) const
1007+
void
1008+
Manager::updateProgressSRC(std::unique_ptr<openpower::pels::PEL>& pel) const
10091009
{
10101010
// Check for pel severity of type - 0x51 = critical error, system
10111011
// termination

Diff for: log_manager.cpp

+7-6
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,10 @@ void Manager::_commit(uint64_t transactionId [[maybe_unused]],
203203
createEntry(errMsg, errLvl, additionalData);
204204
}
205205

206-
auto Manager::createEntry(
207-
std::string errMsg, Entry::Level errLvl,
208-
std::map<std::string, std::string> additionalData,
209-
const FFDCEntries& ffdc) -> sdbusplus::message::object_path
206+
auto Manager::createEntry(std::string errMsg, Entry::Level errLvl,
207+
std::map<std::string, std::string> additionalData,
208+
const FFDCEntries& ffdc)
209+
-> sdbusplus::message::object_path
210210
{
211211
if (!Extensions::disableDefaultLogCaps())
212212
{
@@ -268,8 +268,9 @@ auto Manager::createEntry(
268268
return objPath;
269269
}
270270

271-
auto Manager::createFromEvent(sdbusplus::exception::generated_event_base&&
272-
event) -> sdbusplus::message::object_path
271+
auto
272+
Manager::createFromEvent(sdbusplus::exception::generated_event_base&& event)
273+
-> sdbusplus::message::object_path
273274
{
274275
auto [msg, level, data] = lg2::details::extractEvent(std::move(event));
275276
return this->createEntry(msg, level, std::move(data));

0 commit comments

Comments
 (0)