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: I94e2bfdc8fae9bc14e30c701a0e622709ee9b0fe
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/occ_ffdc.cpp b/occ_ffdc.cpp
index 131913b..da3df79 100644
--- a/occ_ffdc.cpp
+++ b/occ_ffdc.cpp
@@ -57,8 +57,8 @@
}
// Add journal traces to PEL FFDC
- auto occJournalFile = addJournalEntries(pelFFDCInfo,
- "openpower-occ-control", 25);
+ auto occJournalFile =
+ addJournalEntries(pelFFDCInfo, "openpower-occ-control", 25);
std::map<std::string, std::string> additionalData;
additionalData.emplace("SRC6", std::to_string(src6));
@@ -69,11 +69,11 @@
try
{
- std::string service = utils::getService(loggingObjectPath,
- opLoggingInterface);
- auto method = bus.new_method_call(service.c_str(), loggingObjectPath,
- opLoggingInterface,
- "CreatePELWithFFDCFiles");
+ std::string service =
+ utils::getService(loggingObjectPath, opLoggingInterface);
+ auto method =
+ bus.new_method_call(service.c_str(), loggingObjectPath,
+ opLoggingInterface, "CreatePELWithFFDCFiles");
// Set level to Notice (Informational). Error should trigger an OCC
// reset and if it does not recover, HTMGT/HBRT will create an
@@ -128,14 +128,14 @@
{
FFDCFiles ffdc;
// Add journal traces to PEL FFDC
- auto occJournalFile = addJournalEntries(ffdc, "openpower-occ-control",
- 25);
+ auto occJournalFile =
+ addJournalEntries(ffdc, "openpower-occ-control", 25);
- std::string service = utils::getService(loggingObjectPath,
- opLoggingInterface);
- auto method = bus.new_method_call(service.c_str(), loggingObjectPath,
- opLoggingInterface,
- "CreatePELWithFFDCFiles");
+ std::string service =
+ utils::getService(loggingObjectPath, opLoggingInterface);
+ auto method =
+ bus.new_method_call(service.c_str(), loggingObjectPath,
+ opLoggingInterface, "CreatePELWithFFDCFiles");
// Set level to Notice (Informational). Error should trigger an OCC
// reset and if it does not recover, HTMGT/HBRT will create an
@@ -195,8 +195,8 @@
if (total > sbe_status_header_size)
{
- std::string templateString = fs::temp_directory_path() /
- "OCC_FFDC_XXXXXX";
+ std::string templateString =
+ fs::temp_directory_path() / "OCC_FFDC_XXXXXX";
tfd = mkostemp(templateString.data(), O_RDWR);
if (tfd < 0)
{
@@ -232,9 +232,8 @@
}
// Create file with the latest journal entries for specified executable
-std::unique_ptr<FFDCFile> FFDC::addJournalEntries(FFDCFiles& fileList,
- const std::string& executable,
- unsigned int lines)
+std::unique_ptr<FFDCFile> FFDC::addJournalEntries(
+ FFDCFiles& fileList, const std::string& executable, unsigned int lines)
{
auto journalFile = makeJsonFFDCFile(getJournalEntries(lines, executable));
if (journalFile && journalFile->fd() != -1)
@@ -342,8 +341,8 @@
message = getFieldValue(journal, "MESSAGE");
// Build one line string containing field values
- entries.push_back(timeStamp + " " + syslogID + "[" + pid +
- "]: " + message);
+ entries.push_back(
+ timeStamp + " " + syslogID + "[" + pid + "]: " + message);
// Stop after number of lines was read
if (count++ >= numLines)