Rename all error_code instances to ec
We're not consistent here, which leads to people copying and pasting
code all over, which has lead to a bunch of different names for error
codes.
This commit changes to coerce them all to "ec", because that's what
boost uses for a naming convention.
Tested: Rename only, code compiles.
Change-Id: I7053cc738faa9f7a82f55fc46fc78618bdf702a5
Signed-off-by: Ed Tanous <edtanous@google.com>
diff --git a/redfish-core/lib/update_service.hpp b/redfish-core/lib/update_service.hpp
index 45d5664..28621d5 100644
--- a/redfish-core/lib/update_service.hpp
+++ b/redfish-core/lib/update_service.hpp
@@ -67,11 +67,11 @@
*crow::connections::systemBus, service, objPath,
"xyz.openbmc_project.Software.Activation", "RequestedActivation",
"xyz.openbmc_project.Software.Activation.RequestedActivations.Active",
- [](const boost::system::error_code& errorCode) {
- if (errorCode)
+ [](const boost::system::error_code& ec) {
+ if (ec)
{
- BMCWEB_LOG_DEBUG << "error_code = " << errorCode;
- BMCWEB_LOG_DEBUG << "error msg = " << errorCode.message();
+ BMCWEB_LOG_DEBUG << "error_code = " << ec;
+ BMCWEB_LOG_DEBUG << "error msg = " << ec.message();
}
});
}
@@ -101,14 +101,14 @@
dbus::utility::getDbusObject(
objPath.str, interfaces,
[objPath, asyncResp, payload(std::move(payload))](
- const boost::system::error_code& errorCode,
+ const boost::system::error_code& ec,
const std::vector<
std::pair<std::string, std::vector<std::string>>>&
objInfo) mutable {
- if (errorCode)
+ if (ec)
{
- BMCWEB_LOG_DEBUG << "error_code = " << errorCode;
- BMCWEB_LOG_DEBUG << "error msg = " << errorCode.message();
+ BMCWEB_LOG_DEBUG << "error_code = " << ec;
+ BMCWEB_LOG_DEBUG << "error msg = " << ec.message();
if (asyncResp)
{
messages::internalError(asyncResp->res);
@@ -138,11 +138,11 @@
{
std::shared_ptr<task::TaskData> task =
task::TaskData::createTask(
- [](const boost::system::error_code& ec,
+ [](const boost::system::error_code& ec2,
sdbusplus::message_t& msg,
const std::shared_ptr<task::TaskData>&
taskData) {
- if (ec)
+ if (ec2)
{
return task::completed;
}
@@ -903,9 +903,9 @@
*crow::connections::systemBus, service, path,
"xyz.openbmc_project.Software.Version",
[asyncResp,
- swId](const boost::system::error_code& errorCode,
+ swId](const boost::system::error_code& ec,
const dbus::utility::DBusPropertiesMap& propertiesList) {
- if (errorCode)
+ if (ec)
{
messages::internalError(asyncResp->res);
return;