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/log_services.hpp b/redfish-core/lib/log_services.hpp
index b0c711b..ceb80d4 100644
--- a/redfish-core/lib/log_services.hpp
+++ b/redfish-core/lib/log_services.hpp
@@ -3686,7 +3686,7 @@
}
static bool fillPostCodeEntry(
- const std::shared_ptr<bmcweb::AsyncResp>& aResp,
+ const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
const boost::container::flat_map<
uint64_t, std::tuple<uint64_t, std::vector<uint8_t>>>& postcode,
const uint16_t bootIndex, const uint64_t codeIndex = 0,
@@ -3808,11 +3808,11 @@
// that entry in this case
if (codeIndex != 0)
{
- aResp->res.jsonValue.update(bmcLogEntry);
+ asyncResp->res.jsonValue.update(bmcLogEntry);
return true;
}
- nlohmann::json& logEntryArray = aResp->res.jsonValue["Members"];
+ nlohmann::json& logEntryArray = asyncResp->res.jsonValue["Members"];
logEntryArray.emplace_back(std::move(bmcLogEntry));
}
@@ -3820,27 +3820,28 @@
return false;
}
-static void getPostCodeForEntry(const std::shared_ptr<bmcweb::AsyncResp>& aResp,
- const std::string& entryId)
+static void
+ getPostCodeForEntry(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
+ const std::string& entryId)
{
uint16_t bootIndex = 0;
uint64_t codeIndex = 0;
if (!parsePostCode(entryId, codeIndex, bootIndex))
{
// Requested ID was not found
- messages::resourceNotFound(aResp->res, "LogEntry", entryId);
+ messages::resourceNotFound(asyncResp->res, "LogEntry", entryId);
return;
}
if (bootIndex == 0 || codeIndex == 0)
{
// 0 is an invalid index
- messages::resourceNotFound(aResp->res, "LogEntry", entryId);
+ messages::resourceNotFound(asyncResp->res, "LogEntry", entryId);
return;
}
crow::connections::systemBus->async_method_call(
- [aResp, entryId, bootIndex,
+ [asyncResp, entryId, bootIndex,
codeIndex](const boost::system::error_code& ec,
const boost::container::flat_map<
uint64_t, std::tuple<uint64_t, std::vector<uint8_t>>>&
@@ -3848,19 +3849,19 @@
if (ec)
{
BMCWEB_LOG_DEBUG << "DBUS POST CODE PostCode response error";
- messages::internalError(aResp->res);
+ messages::internalError(asyncResp->res);
return;
}
if (postcode.empty())
{
- messages::resourceNotFound(aResp->res, "LogEntry", entryId);
+ messages::resourceNotFound(asyncResp->res, "LogEntry", entryId);
return;
}
- if (!fillPostCodeEntry(aResp, postcode, bootIndex, codeIndex))
+ if (!fillPostCodeEntry(asyncResp, postcode, bootIndex, codeIndex))
{
- messages::resourceNotFound(aResp->res, "LogEntry", entryId);
+ messages::resourceNotFound(asyncResp->res, "LogEntry", entryId);
return;
}
},
@@ -3870,14 +3871,13 @@
bootIndex);
}
-static void getPostCodeForBoot(const std::shared_ptr<bmcweb::AsyncResp>& aResp,
- const uint16_t bootIndex,
- const uint16_t bootCount,
- const uint64_t entryCount, size_t skip,
- size_t top)
+static void
+ getPostCodeForBoot(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
+ const uint16_t bootIndex, const uint16_t bootCount,
+ const uint64_t entryCount, size_t skip, size_t top)
{
crow::connections::systemBus->async_method_call(
- [aResp, bootIndex, bootCount, entryCount, skip,
+ [asyncResp, bootIndex, bootCount, entryCount, skip,
top](const boost::system::error_code& ec,
const boost::container::flat_map<
uint64_t, std::tuple<uint64_t, std::vector<uint8_t>>>&
@@ -3885,7 +3885,7 @@
if (ec)
{
BMCWEB_LOG_DEBUG << "DBUS POST CODE PostCode response error";
- messages::internalError(aResp->res);
+ messages::internalError(asyncResp->res);
return;
}
@@ -3902,21 +3902,21 @@
std::min(static_cast<uint64_t>(top + skip), endCount) -
entryCount;
- fillPostCodeEntry(aResp, postcode, bootIndex, 0, thisBootSkip,
- thisBootTop);
+ fillPostCodeEntry(asyncResp, postcode, bootIndex, 0,
+ thisBootSkip, thisBootTop);
}
- aResp->res.jsonValue["Members@odata.count"] = endCount;
+ asyncResp->res.jsonValue["Members@odata.count"] = endCount;
}
// continue to previous bootIndex
if (bootIndex < bootCount)
{
- getPostCodeForBoot(aResp, static_cast<uint16_t>(bootIndex + 1),
+ getPostCodeForBoot(asyncResp, static_cast<uint16_t>(bootIndex + 1),
bootCount, endCount, skip, top);
}
else if (skip + top < endCount)
{
- aResp->res.jsonValue["Members@odata.nextLink"] =
+ asyncResp->res.jsonValue["Members@odata.nextLink"] =
"/redfish/v1/Systems/system/LogServices/PostCodes/Entries?$skip=" +
std::to_string(skip + top);
}
@@ -3928,7 +3928,7 @@
}
static void
- getCurrentBootNumber(const std::shared_ptr<bmcweb::AsyncResp>& aResp,
+ getCurrentBootNumber(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
size_t skip, size_t top)
{
uint64_t entryCount = 0;
@@ -3937,15 +3937,15 @@
"xyz.openbmc_project.State.Boot.PostCode0",
"/xyz/openbmc_project/State/Boot/PostCode0",
"xyz.openbmc_project.State.Boot.PostCode", "CurrentBootCycleCount",
- [aResp, entryCount, skip, top](const boost::system::error_code& ec,
- const uint16_t bootCount) {
+ [asyncResp, entryCount, skip, top](const boost::system::error_code& ec,
+ const uint16_t bootCount) {
if (ec)
{
BMCWEB_LOG_DEBUG << "DBUS response error " << ec;
- messages::internalError(aResp->res);
+ messages::internalError(asyncResp->res);
return;
}
- getPostCodeForBoot(aResp, 1, bootCount, entryCount, skip, top);
+ getPostCodeForBoot(asyncResp, 1, bootCount, entryCount, skip, top);
});
}