Try to fix the lambda formatting issue
clang-tidy has a setting, LambdaBodyIndentation, which it says:
"For callback-heavy code, it may improve readability to have the
signature indented two levels and to use OuterScope."
bmcweb is very callback heavy code. Try to enable it and see if that
improves things. There are many cases where the length of a lambda call
will change, and reindent the entire lambda function. This is really
bad for code reviews, as it's difficult to see the lines changed. This
commit should resolve it. This does have the downside of reindenting a
lot of functions, which is unfortunate, but probably worth it in the
long run.
All changes except for the .clang-format file were made by the robot.
Tested: Code compiles, whitespace changes only.
Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: Ib4aa2f1391fada981febd25b67dcdb9143827f43
diff --git a/include/async_resolve.hpp b/include/async_resolve.hpp
index 87f53a0..8a5cc4e 100644
--- a/include/async_resolve.hpp
+++ b/include/async_resolve.hpp
@@ -37,53 +37,52 @@
const std::vector<
std::tuple<int32_t, int32_t, std::vector<uint8_t>>>& resp,
const std::string& hostName, const uint64_t flagNum) {
- std::vector<boost::asio::ip::tcp::endpoint> endpointList;
- if (ec)
+ std::vector<boost::asio::ip::tcp::endpoint> endpointList;
+ if (ec)
+ {
+ BMCWEB_LOG_ERROR << "Resolve failed: " << ec.message();
+ handler(ec, endpointList);
+ return;
+ }
+ BMCWEB_LOG_DEBUG << "ResolveHostname returned: " << hostName << ":"
+ << flagNum;
+ // Extract the IP address from the response
+ for (auto resolveList : resp)
+ {
+ std::vector<uint8_t> ipAddress = std::get<2>(resolveList);
+ boost::asio::ip::tcp::endpoint endpoint;
+ if (ipAddress.size() == 4) // ipv4 address
{
- BMCWEB_LOG_ERROR << "Resolve failed: " << ec.message();
+ BMCWEB_LOG_DEBUG << "ipv4 address";
+ boost::asio::ip::address_v4 ipv4Addr(
+ {ipAddress[0], ipAddress[1], ipAddress[2],
+ ipAddress[3]});
+ endpoint.address(ipv4Addr);
+ }
+ else if (ipAddress.size() == 16) // ipv6 address
+ {
+ BMCWEB_LOG_DEBUG << "ipv6 address";
+ boost::asio::ip::address_v6 ipv6Addr(
+ {ipAddress[0], ipAddress[1], ipAddress[2], ipAddress[3],
+ ipAddress[4], ipAddress[5], ipAddress[6], ipAddress[7],
+ ipAddress[8], ipAddress[9], ipAddress[10],
+ ipAddress[11], ipAddress[12], ipAddress[13],
+ ipAddress[14], ipAddress[15]});
+ endpoint.address(ipv6Addr);
+ }
+ else
+ {
+ BMCWEB_LOG_ERROR
+ << "Resolve failed to fetch the IP address";
handler(ec, endpointList);
return;
}
- BMCWEB_LOG_DEBUG << "ResolveHostname returned: " << hostName
- << ":" << flagNum;
- // Extract the IP address from the response
- for (auto resolveList : resp)
- {
- std::vector<uint8_t> ipAddress = std::get<2>(resolveList);
- boost::asio::ip::tcp::endpoint endpoint;
- if (ipAddress.size() == 4) // ipv4 address
- {
- BMCWEB_LOG_DEBUG << "ipv4 address";
- boost::asio::ip::address_v4 ipv4Addr(
- {ipAddress[0], ipAddress[1], ipAddress[2],
- ipAddress[3]});
- endpoint.address(ipv4Addr);
- }
- else if (ipAddress.size() == 16) // ipv6 address
- {
- BMCWEB_LOG_DEBUG << "ipv6 address";
- boost::asio::ip::address_v6 ipv6Addr(
- {ipAddress[0], ipAddress[1], ipAddress[2],
- ipAddress[3], ipAddress[4], ipAddress[5],
- ipAddress[6], ipAddress[7], ipAddress[8],
- ipAddress[9], ipAddress[10], ipAddress[11],
- ipAddress[12], ipAddress[13], ipAddress[14],
- ipAddress[15]});
- endpoint.address(ipv6Addr);
- }
- else
- {
- BMCWEB_LOG_ERROR
- << "Resolve failed to fetch the IP address";
- handler(ec, endpointList);
- return;
- }
- endpoint.port(port);
- BMCWEB_LOG_DEBUG << "resolved endpoint is : " << endpoint;
- endpointList.push_back(endpoint);
- }
- // All the resolved data is filled in the endpointList
- handler(ec, endpointList);
+ endpoint.port(port);
+ BMCWEB_LOG_DEBUG << "resolved endpoint is : " << endpoint;
+ endpointList.push_back(endpoint);
+ }
+ // All the resolved data is filled in the endpointList
+ handler(ec, endpointList);
},
"org.freedesktop.resolve1", "/org/freedesktop/resolve1",
"org.freedesktop.resolve1.Manager", "ResolveHostname", 0, host,