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: I9babcd0ff6648be0d5e827ed5e42ce1b9bc9d34d
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/nvme_manager.cpp b/nvme_manager.cpp
index 26d7b30..7270e9f 100644
--- a/nvme_manager.cpp
+++ b/nvme_manager.cpp
@@ -265,9 +265,9 @@
return nvmeData.present;
}
- auto res_int = smbus.SendSmbusRWCmdRAW(busID, NVME_SSD_SLAVE_ADDRESS,
- &tx_data, sizeof(tx_data),
- rsp_data_command_0, CODE_0_LENGTH);
+ auto res_int = smbus.SendSmbusRWCmdRAW(
+ busID, NVME_SSD_SLAVE_ADDRESS, &tx_data, sizeof(tx_data),
+ rsp_data_command_0, CODE_0_LENGTH);
if (res_int < 0)
{
@@ -318,8 +318,8 @@
return nvmeData.present;
}
- nvmeData.vendor = intToHex(rsp_data_command_8[1]) + " " +
- intToHex(rsp_data_command_8[2]);
+ nvmeData.vendor =
+ intToHex(rsp_data_command_8[1]) + " " + intToHex(rsp_data_command_8[2]);
for (auto iter = map_vendor.begin(); iter != map_vendor.end(); iter++)
{
@@ -433,10 +433,10 @@
static const std::vector<Json> empty{};
std::vector<Json> readings = data.value("config", empty);
std::vector<Json> thresholds = data.value("threshold", empty);
- monitorIntervalSec = data.value("monitorIntervalSec",
- MONITOR_INTERVAL_SECONDS);
- maxSmbusErrorRetry = data.value("maxSmbusErrorRetry",
- MAX_SMBUS_ERROR_RETRY);
+ monitorIntervalSec =
+ data.value("monitorIntervalSec", MONITOR_INTERVAL_SECONDS);
+ maxSmbusErrorRetry =
+ data.value("maxSmbusErrorRetry", MAX_SMBUS_ERROR_RETRY);
if (!thresholds.empty())
{
@@ -660,10 +660,10 @@
NVMeData nvmeData;
inventoryPath = NVME_INVENTORY_PATH + config.index;
- devPresentPath = GPIO_BASE_PATH + std::to_string(config.presentPin) +
- "/value";
- devPwrGoodPath = GPIO_BASE_PATH + std::to_string(config.pwrGoodPin) +
- "/value";
+ devPresentPath =
+ GPIO_BASE_PATH + std::to_string(config.presentPin) + "/value";
+ devPwrGoodPath =
+ GPIO_BASE_PATH + std::to_string(config.pwrGoodPin) + "/value";
auto presentPinValStr = (config.presentPin)
? getGPIOValueOfNvme(devPresentPath)