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: I8c84201cb2343a8c8a5507a49de0721a1bee7063
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/oem/ibm/test/libpldmresponder_fileio_test.cpp b/oem/ibm/test/libpldmresponder_fileio_test.cpp
index 2ca1016..36c6e74 100644
--- a/oem/ibm/test/libpldmresponder_fileio_test.cpp
+++ b/oem/ibm/test/libpldmresponder_fileio_test.cpp
@@ -620,8 +620,8 @@
requestMsg{};
auto requestMsgPtr = reinterpret_cast<pldm_msg*>(requestMsg.data());
auto payload_length = requestMsg.size() - sizeof(pldm_msg_hdr);
- auto request = reinterpret_cast<pldm_read_file_req*>(requestMsg.data() +
- sizeof(pldm_msg_hdr));
+ auto request = reinterpret_cast<pldm_read_file_req*>(
+ requestMsg.data() + sizeof(pldm_msg_hdr));
request->file_handle = fileHandle;
request->offset = offset;
@@ -668,8 +668,8 @@
requestMsg{};
auto requestMsgPtr = reinterpret_cast<pldm_msg*>(requestMsg.data());
auto payload_length = requestMsg.size() - sizeof(pldm_msg_hdr);
- auto request = reinterpret_cast<pldm_read_file_req*>(requestMsg.data() +
- sizeof(pldm_msg_hdr));
+ auto request = reinterpret_cast<pldm_read_file_req*>(
+ requestMsg.data() + sizeof(pldm_msg_hdr));
request->file_handle = fileHandle;
request->offset = offset;
@@ -706,8 +706,8 @@
stream.read(buffer.data(), (fileSize - request->offset));
responseMsg = handler.readFile(requestMsgPtr, payload_length);
- response = reinterpret_cast<pldm_read_file_resp*>(responseMsg.data() +
- sizeof(pldm_msg_hdr));
+ response = reinterpret_cast<pldm_read_file_resp*>(
+ responseMsg.data() + sizeof(pldm_msg_hdr));
ASSERT_EQ(response->completion_code, PLDM_SUCCESS);
ASSERT_EQ(response->length, (fileSize - request->offset));
ASSERT_EQ(0, memcmp(response->file_data, buffer.data(),
@@ -724,12 +724,12 @@
uint8_t host_eid = 0;
int hostSocketFd = 0;
- std::vector<uint8_t> requestMsg(sizeof(pldm_msg_hdr) +
- PLDM_WRITE_FILE_REQ_BYTES + length);
+ std::vector<uint8_t> requestMsg(
+ sizeof(pldm_msg_hdr) + PLDM_WRITE_FILE_REQ_BYTES + length);
auto requestMsgPtr = reinterpret_cast<pldm_msg*>(requestMsg.data());
auto payload_length = requestMsg.size() - sizeof(pldm_msg_hdr);
- auto request = reinterpret_cast<pldm_write_file_req*>(requestMsg.data() +
- sizeof(pldm_msg_hdr));
+ auto request = reinterpret_cast<pldm_write_file_req*>(
+ requestMsg.data() + sizeof(pldm_msg_hdr));
using namespace pldm::filetable;
// Initialise the file table with 2 valid file handles 0 & 1.
@@ -773,12 +773,12 @@
uint8_t host_eid = 0;
int hostSocketFd = 0;
- std::vector<uint8_t> requestMsg(sizeof(pldm_msg_hdr) +
- PLDM_WRITE_FILE_REQ_BYTES + length);
+ std::vector<uint8_t> requestMsg(
+ sizeof(pldm_msg_hdr) + PLDM_WRITE_FILE_REQ_BYTES + length);
auto requestMsgPtr = reinterpret_cast<pldm_msg*>(requestMsg.data());
auto payload_length = requestMsg.size() - sizeof(pldm_msg_hdr);
- auto request = reinterpret_cast<pldm_write_file_req*>(requestMsg.data() +
- sizeof(pldm_msg_hdr));
+ auto request = reinterpret_cast<pldm_write_file_req*>(
+ requestMsg.data() + sizeof(pldm_msg_hdr));
using namespace pldm::filetable;
// Initialise the file table with 2 valid file handles 0 & 1.
diff --git a/oem/ibm/test/libpldmresponder_oem_platform_test.cpp b/oem/ibm/test/libpldmresponder_oem_platform_test.cpp
index 21b6914..a8199f5 100644
--- a/oem/ibm/test/libpldmresponder_oem_platform_test.cpp
+++ b/oem/ibm/test/libpldmresponder_oem_platform_test.cpp
@@ -159,12 +159,12 @@
opStateSensorEventData->present_op_state = uint8_t(CodeUpdateState::START);
opStateSensorEventData->previous_op_state = uint8_t(CodeUpdateState::END);
- std::vector<uint8_t> requestMsg(sizeof(pldm_msg_hdr) +
- PLDM_PLATFORM_EVENT_MESSAGE_MIN_REQ_BYTES +
- sensorEventDataVec.size());
+ std::vector<uint8_t> requestMsg(
+ sizeof(pldm_msg_hdr) + PLDM_PLATFORM_EVENT_MESSAGE_MIN_REQ_BYTES +
+ sensorEventDataVec.size());
- auto rc = encodeEventMsg(PLDM_SENSOR_EVENT, sensorEventDataVec, requestMsg,
- 0x1);
+ auto rc =
+ encodeEventMsg(PLDM_SENSOR_EVENT, sensorEventDataVec, requestMsg, 0x1);
EXPECT_EQ(rc, PLDM_SUCCESS);
}
@@ -174,8 +174,8 @@
std::vector<uint8_t> requestMsg;
std::vector<uint8_t> sensorEventDataVec{};
- auto rc = encodeEventMsg(PLDM_SENSOR_EVENT, sensorEventDataVec, requestMsg,
- 0x1);
+ auto rc =
+ encodeEventMsg(PLDM_SENSOR_EVENT, sensorEventDataVec, requestMsg, 0x1);
EXPECT_EQ(rc, PLDM_ERROR_INVALID_DATA);
}
@@ -210,9 +210,9 @@
std::unique_ptr<CodeUpdate> mockCodeUpdate =
std::make_unique<MockCodeUpdate>(mockDbusHandler.get());
std::unique_ptr<oem_ibm_platform::Handler> mockoemPlatformHandler =
- std::make_unique<MockOemPlatformHandler>(mockDbusHandler.get(),
- mockCodeUpdate.get(), 0x1, 0x9,
- instanceIdDb, event);
+ std::make_unique<MockOemPlatformHandler>(
+ mockDbusHandler.get(), mockCodeUpdate.get(), 0x1, 0x9, instanceIdDb,
+ event);
Repo inRepo(inPDRRepo);
mockoemPlatformHandler->buildOEMPDR(inRepo);
@@ -316,9 +316,9 @@
std::unique_ptr<CodeUpdate> mockCodeUpdate =
std::make_unique<MockCodeUpdate>(mockDbusHandler.get());
std::unique_ptr<oem_ibm_platform::Handler> mockoemPlatformHandler =
- std::make_unique<MockOemPlatformHandler>(mockDbusHandler.get(),
- mockCodeUpdate.get(), 0x1, 0x9,
- instanceIdDb, event);
+ std::make_unique<MockOemPlatformHandler>(
+ mockDbusHandler.get(), mockCodeUpdate.get(), 0x1, 0x9, instanceIdDb,
+ event);
Repo inRepo(inPDRRepo);
mockoemPlatformHandler->buildOEMPDR(inRepo);
ASSERT_EQ(inRepo.empty(), false);
@@ -415,9 +415,9 @@
std::unique_ptr<CodeUpdate> mockCodeUpdate =
std::make_unique<MockCodeUpdate>(mockDbusHandler.get());
std::unique_ptr<oem_ibm_platform::Handler> mockoemPlatformHandler =
- std::make_unique<MockOemPlatformHandler>(mockDbusHandler.get(),
- mockCodeUpdate.get(), 0x1, 0x9,
- instanceIdDb, event);
+ std::make_unique<MockOemPlatformHandler>(
+ mockDbusHandler.get(), mockCodeUpdate.get(), 0x1, 0x9, instanceIdDb,
+ event);
std::string dbuspath = "/inventory/system1/chassis1/motherboard1/dcm0";
mockoemPlatformHandler->updateOemDbusPaths(dbuspath);
EXPECT_EQ(dbuspath, "/inventory/system/chassis/motherboard/dcm0");
@@ -504,8 +504,8 @@
std::vector<std::string> cpuInterface = {"xyz.openbmc_project.Foo.Bar"};
auto oemMockedUtils =
std::make_unique<MockOemUtilsHandler>(&mockedDbusUtils);
- int coreCount = oemMockedUtils->setCoreCount(entityAssociations,
- entityMaps);
+ int coreCount =
+ oemMockedUtils->setCoreCount(entityAssociations, entityMaps);
EXPECT_EQ(coreCount, 2);
pldm_entity_association_tree_destroy(tree);
}