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: I21d2ca8065f24fd73509229c517f5caf48934b60
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/extensions/openpower-pels/json_utils.cpp b/extensions/openpower-pels/json_utils.cpp
index fa3246e..ce2a27d 100644
--- a/extensions/openpower-pels/json_utils.cpp
+++ b/extensions/openpower-pels/json_utils.cpp
@@ -176,8 +176,8 @@
void jsonInsert(std::string& jsonStr, const std::string& fieldName,
const std::string& fieldValue, uint8_t indentCount)
{
- const int8_t spacesToAppend = colAlign - (indentCount * indentLevel) -
- fieldName.length() - 3;
+ const int8_t spacesToAppend =
+ colAlign - (indentCount * indentLevel) - fieldName.length() - 3;
const std::string jsonIndent(indentCount * indentLevel, 0x20);
jsonStr.append(jsonIndent + "\"" + fieldName + "\":");
if (spacesToAppend >= 0)
@@ -215,8 +215,8 @@
}
else
{
- const int8_t spacesToAppend = colAlign - (indentCount * indentLevel) -
- fieldName.length() - 3;
+ const int8_t spacesToAppend =
+ colAlign - (indentCount * indentLevel) - fieldName.length() - 3;
jsonStr.append(jsonIndent + "\"" + fieldName + "\":");
if (spacesToAppend > 0)
{
@@ -252,14 +252,14 @@
* @param[in] creatorID - The creator ID for the PEL
* @return optional<string> - The comp name, or std::nullopt
*/
-static std::optional<std::string> lookupComponentName(uint16_t compID,
- char creatorID)
+static std::optional<std::string>
+ lookupComponentName(uint16_t compID, char creatorID)
{
static std::map<char, nlohmann::json> jsonCache;
nlohmann::json jsonData;
nlohmann::json* jsonPtr = &jsonData;
- std::filesystem::path filename{std::string{creatorID} +
- "_component_ids.json"};
+ std::filesystem::path filename{
+ std::string{creatorID} + "_component_ids.json"};
filename = getPELReadOnlyDataPath() / filename;
auto jsonIt = jsonCache.find(creatorID);