Consistently name AsyncResp variables
In about half of our code, AsyncResp objects take the name asyncResp,
and in the other half they take the name aResp. While the difference
between them is negligeble and arbitrary, having two naming conventions
makes it more difficult to do automated changes over time via grep.
This commit was generated automtatically with the command:
git grep -l 'aResp' | xargs sed -i 's|aResp|asyncResp|g'
Tested: Code compiles.
Change-Id: Id363437b6a78f51e91cbf60aa0a0c2286f36a037
Signed-off-by: Ed Tanous <edtanous@google.com>
diff --git a/redfish-core/lib/led.hpp b/redfish-core/lib/led.hpp
index a5725f1..64b097a 100644
--- a/redfish-core/lib/led.hpp
+++ b/redfish-core/lib/led.hpp
@@ -27,34 +27,34 @@
/**
* @brief Retrieves identify led group properties over dbus
*
- * @param[in] aResp Shared pointer for generating response message.
+ * @param[in] asyncResp Shared pointer for generating response message.
*
* @return None.
*/
// TODO (Gunnar): Remove IndicatorLED after enough time has passed
inline void
- getIndicatorLedState(const std::shared_ptr<bmcweb::AsyncResp>& aResp)
+ getIndicatorLedState(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp)
{
BMCWEB_LOG_DEBUG << "Get led groups";
sdbusplus::asio::getProperty<bool>(
*crow::connections::systemBus, "xyz.openbmc_project.LED.GroupManager",
"/xyz/openbmc_project/led/groups/enclosure_identify_blink",
"xyz.openbmc_project.Led.Group", "Asserted",
- [aResp](const boost::system::error_code& ec, const bool blinking) {
+ [asyncResp](const boost::system::error_code& ec, const bool blinking) {
// Some systems may not have enclosure_identify_blink object so
// proceed to get enclosure_identify state.
if (ec == boost::system::errc::invalid_argument)
{
BMCWEB_LOG_DEBUG
<< "Get identity blinking LED failed, missmatch in property type";
- messages::internalError(aResp->res);
+ messages::internalError(asyncResp->res);
return;
}
// Blinking ON, no need to check enclosure_identify assert.
if (!ec && blinking)
{
- aResp->res.jsonValue["IndicatorLED"] = "Blinking";
+ asyncResp->res.jsonValue["IndicatorLED"] = "Blinking";
return;
}
@@ -63,12 +63,13 @@
"xyz.openbmc_project.LED.GroupManager",
"/xyz/openbmc_project/led/groups/enclosure_identify",
"xyz.openbmc_project.Led.Group", "Asserted",
- [aResp](const boost::system::error_code& ec2, const bool ledOn) {
+ [asyncResp](const boost::system::error_code& ec2,
+ const bool ledOn) {
if (ec2 == boost::system::errc::invalid_argument)
{
BMCWEB_LOG_DEBUG
<< "Get enclosure identity led failed, missmatch in property type";
- messages::internalError(aResp->res);
+ messages::internalError(asyncResp->res);
return;
}
@@ -79,11 +80,11 @@
if (ledOn)
{
- aResp->res.jsonValue["IndicatorLED"] = "Lit";
+ asyncResp->res.jsonValue["IndicatorLED"] = "Lit";
}
else
{
- aResp->res.jsonValue["IndicatorLED"] = "Off";
+ asyncResp->res.jsonValue["IndicatorLED"] = "Off";
}
});
});
@@ -92,14 +93,14 @@
/**
* @brief Sets identify led group properties
*
- * @param[in] aResp Shared pointer for generating response message.
+ * @param[in] asyncResp Shared pointer for generating response message.
* @param[in] ledState LED state passed from request
*
* @return None.
*/
// TODO (Gunnar): Remove IndicatorLED after enough time has passed
inline void
- setIndicatorLedState(const std::shared_ptr<bmcweb::AsyncResp>& aResp,
+ setIndicatorLedState(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
const std::string& ledState)
{
BMCWEB_LOG_DEBUG << "Set led groups";
@@ -116,12 +117,13 @@
}
else if (ledState != "Off")
{
- messages::propertyValueNotInList(aResp->res, ledState, "IndicatorLED");
+ messages::propertyValueNotInList(asyncResp->res, ledState,
+ "IndicatorLED");
return;
}
crow::connections::systemBus->async_method_call(
- [aResp, ledOn,
+ [asyncResp, ledOn,
ledBlinkng](const boost::system::error_code& ec) mutable {
if (ec)
{
@@ -134,14 +136,14 @@
}
}
crow::connections::systemBus->async_method_call(
- [aResp](const boost::system::error_code& ec2) {
+ [asyncResp](const boost::system::error_code& ec2) {
if (ec2)
{
BMCWEB_LOG_DEBUG << "DBUS response error " << ec2;
- messages::internalError(aResp->res);
+ messages::internalError(asyncResp->res);
return;
}
- messages::success(aResp->res);
+ messages::success(asyncResp->res);
},
"xyz.openbmc_project.LED.GroupManager",
"/xyz/openbmc_project/led/groups/enclosure_identify",
@@ -159,33 +161,33 @@
/**
* @brief Retrieves identify led group properties over dbus
*
- * @param[in] aResp Shared pointer for generating response message.
+ * @param[in] asyncResp Shared pointer for generating response message.
*
* @return None.
*/
-inline void
- getLocationIndicatorActive(const std::shared_ptr<bmcweb::AsyncResp>& aResp)
+inline void getLocationIndicatorActive(
+ const std::shared_ptr<bmcweb::AsyncResp>& asyncResp)
{
BMCWEB_LOG_DEBUG << "Get LocationIndicatorActive";
sdbusplus::asio::getProperty<bool>(
*crow::connections::systemBus, "xyz.openbmc_project.LED.GroupManager",
"/xyz/openbmc_project/led/groups/enclosure_identify_blink",
"xyz.openbmc_project.Led.Group", "Asserted",
- [aResp](const boost::system::error_code& ec, const bool blinking) {
+ [asyncResp](const boost::system::error_code& ec, const bool blinking) {
// Some systems may not have enclosure_identify_blink object so
// proceed to get enclosure_identify state.
if (ec == boost::system::errc::invalid_argument)
{
BMCWEB_LOG_DEBUG
<< "Get identity blinking LED failed, missmatch in property type";
- messages::internalError(aResp->res);
+ messages::internalError(asyncResp->res);
return;
}
// Blinking ON, no need to check enclosure_identify assert.
if (!ec && blinking)
{
- aResp->res.jsonValue["LocationIndicatorActive"] = true;
+ asyncResp->res.jsonValue["LocationIndicatorActive"] = true;
return;
}
@@ -194,12 +196,13 @@
"xyz.openbmc_project.LED.GroupManager",
"/xyz/openbmc_project/led/groups/enclosure_identify",
"xyz.openbmc_project.Led.Group", "Asserted",
- [aResp](const boost::system::error_code& ec2, const bool ledOn) {
+ [asyncResp](const boost::system::error_code& ec2,
+ const bool ledOn) {
if (ec2 == boost::system::errc::invalid_argument)
{
BMCWEB_LOG_DEBUG
<< "Get enclosure identity led failed, missmatch in property type";
- messages::internalError(aResp->res);
+ messages::internalError(asyncResp->res);
return;
}
@@ -208,7 +211,7 @@
return;
}
- aResp->res.jsonValue["LocationIndicatorActive"] = ledOn;
+ asyncResp->res.jsonValue["LocationIndicatorActive"] = ledOn;
});
});
}
@@ -216,30 +219,29 @@
/**
* @brief Sets identify led group properties
*
- * @param[in] aResp Shared pointer for generating response message.
+ * @param[in] asyncResp Shared pointer for generating response message.
* @param[in] ledState LED state passed from request
*
* @return None.
*/
-inline void
- setLocationIndicatorActive(const std::shared_ptr<bmcweb::AsyncResp>& aResp,
- const bool ledState)
+inline void setLocationIndicatorActive(
+ const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const bool ledState)
{
BMCWEB_LOG_DEBUG << "Set LocationIndicatorActive";
crow::connections::systemBus->async_method_call(
- [aResp, ledState](const boost::system::error_code& ec) mutable {
+ [asyncResp, ledState](const boost::system::error_code& ec) mutable {
if (ec)
{
// Some systems may not have enclosure_identify_blink object so
// lets set enclosure_identify state also if
// enclosure_identify_blink failed
crow::connections::systemBus->async_method_call(
- [aResp](const boost::system::error_code& ec2) {
+ [asyncResp](const boost::system::error_code& ec2) {
if (ec2)
{
BMCWEB_LOG_DEBUG << "DBUS response error " << ec2;
- messages::internalError(aResp->res);
+ messages::internalError(asyncResp->res);
return;
}
},