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: Id49ad73c860533f4658c909e86d6dc8e1423efb4
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/src/fru_utils.hpp b/src/fru_utils.hpp
index 12e28b1..8a117a7 100644
--- a/src/fru_utils.hpp
+++ b/src/fru_utils.hpp
@@ -82,9 +82,9 @@
const std::vector<std::string> chassisFruAreas = {"PART_NUMBER",
"SERIAL_NUMBER"};
-const std::vector<std::string> boardFruAreas = {"MANUFACTURER", "PRODUCT_NAME",
- "SERIAL_NUMBER", "PART_NUMBER",
- "FRU_VERSION_ID"};
+const std::vector<std::string> boardFruAreas = {
+ "MANUFACTURER", "PRODUCT_NAME", "SERIAL_NUMBER", "PART_NUMBER",
+ "FRU_VERSION_ID"};
const std::vector<std::string> productFruAreas = {
"MANUFACTURER", "PRODUCT_NAME", "PART_NUMBER", "VERSION",
@@ -94,8 +94,8 @@
inline fruAreas operator++(fruAreas& x)
{
- return x = static_cast<fruAreas>(std::underlying_type<fruAreas>::type(x) +
- 1);
+ return x = static_cast<fruAreas>(
+ std::underlying_type<fruAreas>::type(x) + 1);
}
inline const std::string& getFruAreaName(fruAreas area)
@@ -117,10 +117,9 @@
bool verifyOffset(const std::vector<uint8_t>& fruBytes, fruAreas currentArea,
uint8_t len);
-std::pair<DecodeState, std::string>
- decodeFRUData(std::vector<uint8_t>::const_iterator& iter,
- const std::vector<uint8_t>::const_iterator& end,
- bool isLangEng);
+std::pair<DecodeState, std::string> decodeFRUData(
+ std::vector<uint8_t>::const_iterator& iter,
+ const std::vector<uint8_t>::const_iterator& end, bool isLangEng);
bool checkLangEng(uint8_t lang);
@@ -135,10 +134,9 @@
uint8_t calculateChecksum(std::vector<uint8_t>& fruAreaData);
-unsigned int updateFRUAreaLenAndChecksum(std::vector<uint8_t>& fruData,
- size_t fruAreaStart,
- size_t fruAreaEndOfFieldsOffset,
- size_t fruAreaEndOffset);
+unsigned int updateFRUAreaLenAndChecksum(
+ std::vector<uint8_t>& fruData, size_t fruAreaStart,
+ size_t fruAreaEndOfFieldsOffset, size_t fruAreaEndOffset);
ssize_t getFieldLength(uint8_t fruFieldTypeLenValue);