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/kvm_websocket.hpp b/include/kvm_websocket.hpp
index fa61b75..79975d2 100644
--- a/include/kvm_websocket.hpp
+++ b/include/kvm_websocket.hpp
@@ -72,30 +72,30 @@
hostSocket.async_read_some(
outputBuffer.prepare(outputBuffer.capacity() - outputBuffer.size()),
[this](const boost::system::error_code& ec, std::size_t bytesRead) {
- BMCWEB_LOG_DEBUG << "conn:" << &conn << ", read done. Read "
- << bytesRead << " bytes";
- if (ec)
+ BMCWEB_LOG_DEBUG << "conn:" << &conn << ", read done. Read "
+ << bytesRead << " bytes";
+ if (ec)
+ {
+ BMCWEB_LOG_ERROR
+ << "conn:" << &conn
+ << ", Couldn't read from KVM socket port: " << ec;
+ if (ec != boost::asio::error::operation_aborted)
{
- BMCWEB_LOG_ERROR
- << "conn:" << &conn
- << ", Couldn't read from KVM socket port: " << ec;
- if (ec != boost::asio::error::operation_aborted)
- {
- conn.close("Error in connecting to KVM port");
- }
- return;
+ conn.close("Error in connecting to KVM port");
}
+ return;
+ }
- outputBuffer.commit(bytesRead);
- std::string_view payload(
- static_cast<const char*>(outputBuffer.data().data()),
- bytesRead);
- BMCWEB_LOG_DEBUG << "conn:" << &conn
- << ", Sending payload size " << payload.size();
- conn.sendBinary(payload);
- outputBuffer.consume(bytesRead);
+ outputBuffer.commit(bytesRead);
+ std::string_view payload(
+ static_cast<const char*>(outputBuffer.data().data()),
+ bytesRead);
+ BMCWEB_LOG_DEBUG << "conn:" << &conn << ", Sending payload size "
+ << payload.size();
+ conn.sendBinary(payload);
+ outputBuffer.consume(bytesRead);
- doRead();
+ doRead();
});
}
@@ -115,32 +115,32 @@
}
doingWrite = true;
- hostSocket.async_write_some(
- inputBuffer.data(), [this](const boost::system::error_code& ec,
- std::size_t bytesWritten) {
- BMCWEB_LOG_DEBUG << "conn:" << &conn << ", Wrote "
- << bytesWritten << "bytes";
- doingWrite = false;
- inputBuffer.consume(bytesWritten);
+ hostSocket.async_write_some(inputBuffer.data(),
+ [this](const boost::system::error_code& ec,
+ std::size_t bytesWritten) {
+ BMCWEB_LOG_DEBUG << "conn:" << &conn << ", Wrote " << bytesWritten
+ << "bytes";
+ doingWrite = false;
+ inputBuffer.consume(bytesWritten);
- if (ec == boost::asio::error::eof)
+ if (ec == boost::asio::error::eof)
+ {
+ conn.close("KVM socket port closed");
+ return;
+ }
+ if (ec)
+ {
+ BMCWEB_LOG_ERROR << "conn:" << &conn
+ << ", Error in KVM socket write " << ec;
+ if (ec != boost::asio::error::operation_aborted)
{
- conn.close("KVM socket port closed");
- return;
+ conn.close("Error in reading to host port");
}
- if (ec)
- {
- BMCWEB_LOG_ERROR << "conn:" << &conn
- << ", Error in KVM socket write " << ec;
- if (ec != boost::asio::error::operation_aborted)
- {
- conn.close("Error in reading to host port");
- }
- return;
- }
+ return;
+ }
- doWrite();
- });
+ doWrite();
+ });
}
crow::websocket::Connection& conn;