Update clang-format
refer: https://github.com/openbmc/docs/blob/master/style/cpp/.clang-format
`Don't break long string literals`
Tested: built bmcweb successfully and RedfishValidator Passed.
Signed-off-by: George Liu <liuxiwei@inspur.com>
Change-Id: Ib58f7c942fd3838592e043c57e0b6ffcdc3d963b
diff --git a/redfish-core/lib/managers.hpp b/redfish-core/lib/managers.hpp
index 344ca83..12af99d 100644
--- a/redfish-core/lib/managers.hpp
+++ b/redfish-core/lib/managers.hpp
@@ -187,9 +187,9 @@
if (resetType != "ResetAll")
{
- BMCWEB_LOG_DEBUG << "Invalid property value for "
- "ResetToDefaultsType: "
- << resetType;
+ BMCWEB_LOG_DEBUG
+ << "Invalid property value for ResetToDefaultsType: "
+ << resetType;
messages::actionParameterNotSupported(
asyncResp->res, resetType, "ResetToDefaultsType");
return;
@@ -276,8 +276,8 @@
asyncResp->res.jsonValue["Oem"]["OpenBmc"]["Fan"];
nlohmann::json& fans = configRoot["FanControllers"];
fans["@odata.type"] = "#OemManager.FanControllers";
- fans["@odata.id"] = "/redfish/v1/Managers/bmc#/Oem/OpenBmc/"
- "Fan/FanControllers";
+ fans["@odata.id"] =
+ "/redfish/v1/Managers/bmc#/Oem/OpenBmc/Fan/FanControllers";
nlohmann::json& pids = configRoot["PidControllers"];
pids["@odata.type"] = "#OemManager.PidControllers";
@@ -373,9 +373,9 @@
nlohmann::json& zone = zones[name];
zone["Chassis"] = {
{"@odata.id", "/redfish/v1/Chassis/" + chassis}};
- zone["@odata.id"] = "/redfish/v1/Managers/bmc#/Oem/"
- "OpenBmc/Fan/FanZones/" +
- name;
+ zone["@odata.id"] =
+ "/redfish/v1/Managers/bmc#/Oem/OpenBmc/Fan/FanZones/" +
+ name;
zone["@odata.type"] = "#OemManager.FanZone";
config = &zone;
}
@@ -393,8 +393,7 @@
config = &controller;
controller["@odata.id"] =
- "/redfish/v1/Managers/bmc#/Oem/"
- "OpenBmc/Fan/StepwiseControllers/" +
+ "/redfish/v1/Managers/bmc#/Oem/OpenBmc/Fan/StepwiseControllers/" +
name;
controller["@odata.type"] =
"#OemManager.StepwiseController";
@@ -419,8 +418,7 @@
if (isFan)
{
element["@odata.id"] =
- "/redfish/v1/Managers/bmc#/Oem/"
- "OpenBmc/Fan/FanControllers/" +
+ "/redfish/v1/Managers/bmc#/Oem/OpenBmc/Fan/FanControllers/" +
name;
element["@odata.type"] =
"#OemManager.FanController";
@@ -428,8 +426,7 @@
else
{
element["@odata.id"] =
- "/redfish/v1/Managers/bmc#/Oem/"
- "OpenBmc/Fan/PidControllers/" +
+ "/redfish/v1/Managers/bmc#/Oem/OpenBmc/Fan/PidControllers/" +
name;
element["@odata.type"] =
"#OemManager.PidController";
@@ -500,8 +497,7 @@
if (keys->size() != values->size())
{
BMCWEB_LOG_ERROR
- << "Reading and Output size don't "
- "match ";
+ << "Reading and Output size don't match ";
messages::internalError(asyncResp->res);
return;
}
@@ -556,8 +552,7 @@
dbus::utility::escapePathForDbus(itemCopy);
data.push_back(
{{"@odata.id",
- "/redfish/v1/Managers/bmc#/Oem/"
- "OpenBmc/Fan/FanZones/" +
+ "/redfish/v1/Managers/bmc#/Oem/OpenBmc/Fan/FanZones/" +
itemCopy}});
}
}
@@ -1190,9 +1185,9 @@
std::string>>& resp) {
if (ec2)
{
- BMCWEB_LOG_ERROR << "GetPIDValues: Can't get "
- "thermalModeIface "
- << path;
+ BMCWEB_LOG_ERROR
+ << "GetPIDValues: Can't get thermalModeIface "
+ << path;
messages::internalError(self->asyncResp->res);
return;
}
@@ -1206,8 +1201,7 @@
if (current == nullptr)
{
BMCWEB_LOG_ERROR
- << "GetPIDValues: thermal mode "
- "iface invalid "
+ << "GetPIDValues: thermal mode iface invalid "
<< path;
messages::internalError(
self->asyncResp->res);
@@ -1222,8 +1216,7 @@
if (supported == nullptr)
{
BMCWEB_LOG_ERROR
- << "GetPIDValues: thermal mode "
- "iface invalid"
+ << "GetPIDValues: thermal mode iface invalid"
<< path;
messages::internalError(
self->asyncResp->res);
@@ -1233,9 +1226,9 @@
}
if (current == nullptr || supported == nullptr)
{
- BMCWEB_LOG_ERROR << "GetPIDValues: thermal mode "
- "iface invalid "
- << path;
+ BMCWEB_LOG_ERROR
+ << "GetPIDValues: thermal mode iface invalid "
+ << path;
messages::internalError(self->asyncResp->res);
return;
}
@@ -1407,9 +1400,9 @@
std::string>>& r) {
if (ec2)
{
- BMCWEB_LOG_ERROR << "SetPIDValues: Can't get "
- "thermalModeIface "
- << path;
+ BMCWEB_LOG_ERROR
+ << "SetPIDValues: Can't get thermalModeIface "
+ << path;
messages::internalError(self->asyncResp->res);
return;
}
@@ -1423,8 +1416,7 @@
if (current == nullptr)
{
BMCWEB_LOG_ERROR
- << "SetPIDValues: thermal mode "
- "iface invalid "
+ << "SetPIDValues: thermal mode iface invalid "
<< path;
messages::internalError(
self->asyncResp->res);
@@ -1439,8 +1431,7 @@
if (supported == nullptr)
{
BMCWEB_LOG_ERROR
- << "SetPIDValues: thermal mode "
- "iface invalid"
+ << "SetPIDValues: thermal mode iface invalid"
<< path;
messages::internalError(
self->asyncResp->res);
@@ -1450,9 +1441,9 @@
}
if (current == nullptr || supported == nullptr)
{
- BMCWEB_LOG_ERROR << "SetPIDValues: thermal mode "
- "iface invalid "
- << path;
+ BMCWEB_LOG_ERROR
+ << "SetPIDValues: thermal mode iface invalid "
+ << path;
messages::internalError(self->asyncResp->res);
return;
}
@@ -1721,9 +1712,7 @@
*value;
},
connectionName, path, "org.freedesktop.DBus.Properties", "Get",
- "xyz.openbmc_project.Inventory.Decorator."
- "LocationCode",
- "LocationCode");
+ "xyz.openbmc_project.Inventory.Decorator.LocationCode", "LocationCode");
}
// avoid name collision systems.hpp
inline void
@@ -2168,12 +2157,11 @@
},
connectionName, path,
"org.freedesktop.DBus.Properties", "GetAll",
- "xyz.openbmc_project.Inventory.Decorator."
- "Asset");
+ "xyz.openbmc_project.Inventory.Decorator.Asset");
}
- else if (interfaceName ==
- "xyz.openbmc_project.Inventory."
- "Decorator.LocationCode")
+ else if (
+ interfaceName ==
+ "xyz.openbmc_project.Inventory.Decorator.LocationCode")
{
getLocation(asyncResp, connectionName, path);
}