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: I1d204ff0a167c43688f2217e9dee5504c71cd4f0
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/util/pldm.cpp b/util/pldm.cpp
index 9dbe138..bbf2ce7 100644
--- a/util/pldm.cpp
+++ b/util/pldm.cpp
@@ -46,11 +46,9 @@
*
* @return PLDM request message to be sent to host, empty message on error
*/
-std::vector<uint8_t> prepareSetEffecterReq(uint16_t effecterId,
- uint8_t effecterCount,
- uint8_t stateIdPos,
- uint8_t stateSetValue,
- uint8_t mctpEid)
+std::vector<uint8_t> prepareSetEffecterReq(
+ uint16_t effecterId, uint8_t effecterCount, uint8_t stateIdPos,
+ uint8_t stateSetValue, uint8_t mctpEid)
{
// get mctp instance associated with the endpoint ID
uint8_t mctpInstance;
@@ -312,41 +310,42 @@
sdbusplus::bus::match::rules::path(path) +
sdbusplus::bus::match::rules::interface(interface),
[&](auto& msg) {
- uint8_t sensorTid{};
- uint16_t sensorId{};
- uint8_t msgSensorOffset{};
- uint8_t eventState{};
- uint8_t previousEventState{};
+ uint8_t sensorTid{};
+ uint16_t sensorId{};
+ uint8_t msgSensorOffset{};
+ uint8_t eventState{};
+ uint8_t previousEventState{};
- // get sensor event details
- msg.read(sensorTid, sensorId, msgSensorOffset, eventState,
- previousEventState);
+ // get sensor event details
+ msg.read(sensorTid, sensorId, msgSensorOffset, eventState,
+ previousEventState);
- // does sensor offset match?
- if (sbeSensorOffset == msgSensorOffset)
- {
- // does sensor ID match?
- auto sensorEntry = sensorToSbeInstance.find(sensorId);
- if (sensorEntry != sensorToSbeInstance.end())
- {
- const uint8_t instance = sensorEntry->second;
-
- // if instances matche check status
- if (instance == sbeInstance)
+ // does sensor offset match?
+ if (sbeSensorOffset == msgSensorOffset)
{
- if (eventState == static_cast<uint8_t>(SBE_HRESET_READY))
+ // does sensor ID match?
+ auto sensorEntry = sensorToSbeInstance.find(sensorId);
+ if (sensorEntry != sensorToSbeInstance.end())
{
- hresetStatus = "success";
- }
- else if (eventState ==
- static_cast<uint8_t>(SBE_HRESET_FAILED))
- {
- hresetStatus = "fail";
+ const uint8_t instance = sensorEntry->second;
+
+ // if instances matche check status
+ if (instance == sbeInstance)
+ {
+ if (eventState ==
+ static_cast<uint8_t>(SBE_HRESET_READY))
+ {
+ hresetStatus = "success";
+ }
+ else if (eventState ==
+ static_cast<uint8_t>(SBE_HRESET_FAILED))
+ {
+ hresetStatus = "fail";
+ }
+ }
}
}
- }
- }
- });
+ });
// send request to issue hreset of sbe
int pldmFd = -1; // mctp socket file descriptor