Last round of variable renames
A few patches were in flight when we did the great variable renaming.
This catches all the patches that have been merged since
Change-Id: I43b006cf159403955c5adee31f3d826e8597c710
Signed-off-by: Ed Tanous <ed.tanous@intel.com>
diff --git a/redfish-core/lib/update_service.hpp b/redfish-core/lib/update_service.hpp
index 658937d..df8473f 100644
--- a/redfish-core/lib/update_service.hpp
+++ b/redfish-core/lib/update_service.hpp
@@ -130,16 +130,16 @@
std::string,
std::vector<std::pair<
std::string, sdbusplus::message::variant<std::string>>>>>
- interfaces_properties;
+ interfacesProperties;
sdbusplus::message::object_path objPath;
- m.read(objPath, interfaces_properties); // Read in the object path
- // that was just created
+ m.read(objPath, interfacesProperties); // Read in the object path
+ // that was just created
// std::string str_objpath = objPath.str; // keep a copy for
// constructing response message
BMCWEB_LOG_DEBUG << "obj path = " << objPath.str; // str_objpath;
- for (auto &interface : interfaces_properties)
+ for (auto &interface : interfacesProperties)
{
BMCWEB_LOG_DEBUG << "interface = " << interface.first;
@@ -256,18 +256,17 @@
return;
}
- const std::string *sw_inv_purpose =
+ const std::string *swInvPurpose =
mapbox::getPtr<const std::string>(
activation);
- if (sw_inv_purpose == nullptr)
+ if (swInvPurpose == nullptr)
{
asyncResp->res.result(
boost::beast::http::status::
internal_server_error);
return;
}
- std::size_t last_pos =
- sw_inv_purpose->rfind(".");
+ std::size_t last_pos = swInvPurpose->rfind(".");
if (last_pos == std::string::npos)
{
asyncResp->res.result(
@@ -278,10 +277,10 @@
nlohmann::json &members =
asyncResp->res.jsonValue["Members"];
members.push_back(
- {{"@odata.id", "/redfish/v1/UpdateService/"
- "FirmwareInventory/" +
- sw_inv_purpose->substr(
- last_pos + 1)}});
+ {{"@odata.id",
+ "/redfish/v1/UpdateService/"
+ "FirmwareInventory/" +
+ swInvPurpose->substr(last_pos + 1)}});
asyncResp->res
.jsonValue["Members@odata.count"] =
members.size();
@@ -343,14 +342,14 @@
return;
}
- std::shared_ptr<std::string> sw_id =
+ std::shared_ptr<std::string> swId =
std::make_shared<std::string>(params[0]);
res.jsonValue["@odata.id"] =
- "/redfish/v1/UpdateService/FirmwareInventory/" + *sw_id;
+ "/redfish/v1/UpdateService/FirmwareInventory/" + *swId;
crow::connections::systemBus->async_method_call(
- [asyncResp, sw_id](
+ [asyncResp, swId](
const boost::system::error_code ec,
const std::vector<std::pair<
std::string, std::vector<std::pair<
@@ -370,7 +369,7 @@
std::pair<std::string, std::vector<std::string>>>>
&obj : subtree)
{
- if (boost::ends_with(obj.first, *sw_id) != true)
+ if (boost::ends_with(obj.first, *swId) != true)
{
continue;
}
@@ -382,9 +381,9 @@
crow::connections::systemBus->async_method_call(
[asyncResp,
- sw_id](const boost::system::error_code error_code,
- const boost::container::flat_map<
- std::string, VariantType> &propertiesList) {
+ swId](const boost::system::error_code error_code,
+ const boost::container::flat_map<
+ std::string, VariantType> &propertiesList) {
if (error_code)
{
asyncResp->res.result(
@@ -404,9 +403,9 @@
internal_server_error);
return;
}
- const std::string *sw_inv_purpose =
+ const std::string *swInvPurpose =
mapbox::getPtr<const std::string>(it->second);
- if (sw_inv_purpose == nullptr)
+ if (swInvPurpose == nullptr)
{
BMCWEB_LOG_DEBUG
<< "wrong types for property\"Purpose\"!";
@@ -416,9 +415,9 @@
return;
}
- BMCWEB_LOG_DEBUG << "sw_inv_purpose = "
- << *sw_inv_purpose;
- if (boost::ends_with(*sw_inv_purpose, "." + *sw_id))
+ BMCWEB_LOG_DEBUG << "swInvPurpose = "
+ << *swInvPurpose;
+ if (boost::ends_with(*swInvPurpose, "." + *swId))
{
it = propertiesList.find("Version");
if (it == propertiesList.end())
@@ -445,7 +444,7 @@
return;
}
asyncResp->res.jsonValue["Version"] = *version;
- asyncResp->res.jsonValue["Id"] = *sw_id;
+ asyncResp->res.jsonValue["Id"] = *swId;
}
},
obj.second[0].first, obj.first,