From: Remi Gacogne Date: Thu, 14 Oct 2021 07:30:41 +0000 (+0200) Subject: dnsdist: Fix formatting X-Git-Tag: rec-4.6.0-beta1~34^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea090af9d1303b418b7ef8f62535d2fb62802294;p=thirdparty%2Fpdns.git dnsdist: Fix formatting --- diff --git a/pdns/dnsdistdist/dnsdist-nghttp2.cc b/pdns/dnsdistdist/dnsdist-nghttp2.cc index e9a659129b..452c3c414d 100644 --- a/pdns/dnsdistdist/dnsdist-nghttp2.cc +++ b/pdns/dnsdistdist/dnsdist-nghttp2.cc @@ -95,7 +95,7 @@ private: bool d_finished{false}; }; void addToIOState(IOState state, FDMultiplexer::callbackfunc_t callback); - void updateIO(IOState newState, FDMultiplexer::callbackfunc_t callback, bool noTTD=false); + void updateIO(IOState newState, FDMultiplexer::callbackfunc_t callback, bool noTTD = false); void watchForRemoteHostClosingConnection(); void handleResponse(PendingRequest&& request); void handleResponseError(PendingRequest&& request, const struct timeval& now); diff --git a/pdns/dnsdistdist/test-dnsdistnghttp2_cc.cc b/pdns/dnsdistdist/test-dnsdistnghttp2_cc.cc index 5886d1a229..762af027cc 100644 --- a/pdns/dnsdistdist/test-dnsdistnghttp2_cc.cc +++ b/pdns/dnsdistdist/test-dnsdistnghttp2_cc.cc @@ -909,21 +909,21 @@ BOOST_FIXTURE_TEST_CASE(test_ConnectionReuse, TestFixture) {ExpectedStep::ExpectedRequest::readFromBackend, IOState::Done, std::numeric_limits::max()}, /* acknowledge settings */ {ExpectedStep::ExpectedRequest::writeToBackend, IOState::Done, std::numeric_limits::max(), [&firstQueryDone](int desc, const ExpectedStep& step) { - firstQueryDone = true; - }}, + firstQueryDone = true; + }}, /* headers */ {ExpectedStep::ExpectedRequest::writeToBackend, IOState::Done, std::numeric_limits::max(), [](int desc, const ExpectedStep& step) { - }}, + }}, /* data */ {ExpectedStep::ExpectedRequest::writeToBackend, IOState::Done, std::numeric_limits::max(), [](int desc, const ExpectedStep& step) { /* set the outgoing descriptor (backend connection) as ready */ - dynamic_cast(s_mplexer.get())->setReady(desc); + dynamic_cast(s_mplexer.get())->setReady(desc); }}, /* read settings, headers and responses from the server */ {ExpectedStep::ExpectedRequest::readFromBackend, IOState::Done, std::numeric_limits::max()}, /* later the backend sends a go away frame */ {ExpectedStep::ExpectedRequest::readFromBackend, IOState::Done, std::numeric_limits::max(), [](int desc, const ExpectedStep& step) { - s_connectionBuffers.at(desc)->submitGoAway(); + s_connectionBuffers.at(desc)->submitGoAway(); }}, {ExpectedStep::ExpectedRequest::closeBackend, IOState::Done}, }; @@ -1022,7 +1022,7 @@ BOOST_FIXTURE_TEST_CASE(test_InvalidDNSAnswer, TestFixture) {ExpectedStep::ExpectedRequest::writeToBackend, IOState::Done, std::numeric_limits::max()}, /* try to read, the backend says to go away */ {ExpectedStep::ExpectedRequest::readFromBackend, IOState::Done, std::numeric_limits::max(), [](int desc, const ExpectedStep& step) { - s_connectionBuffers.at(desc)->submitGoAway(); + s_connectionBuffers.at(desc)->submitGoAway(); }}, {ExpectedStep::ExpectedRequest::closeBackend, IOState::Done}, }; @@ -1274,10 +1274,10 @@ BOOST_FIXTURE_TEST_CASE(test_ShortWrite, TestFixture) {ExpectedStep::ExpectedRequest::readFromBackend, IOState::Done, std::numeric_limits::max()}, /* acknowledge settings */ {ExpectedStep::ExpectedRequest::writeToBackend, IOState::Done, std::numeric_limits::max(), [&done](int desc, const ExpectedStep& step) { - /* mark backend as not ready */ - dynamic_cast(s_mplexer.get())->setNotReady(desc); - done = true; - }}, + /* mark backend as not ready */ + dynamic_cast(s_mplexer.get())->setNotReady(desc); + done = true; + }}, {ExpectedStep::ExpectedRequest::closeBackend, IOState::Done}, }; @@ -1368,10 +1368,10 @@ BOOST_FIXTURE_TEST_CASE(test_ShortRead, TestFixture) {ExpectedStep::ExpectedRequest::readFromBackend, IOState::Done, std::numeric_limits::max()}, /* acknowledge settings */ {ExpectedStep::ExpectedRequest::writeToBackend, IOState::Done, std::numeric_limits::max(), [&done](int desc, const ExpectedStep& step) { - /* mark backend as not ready */ - dynamic_cast(s_mplexer.get())->setNotReady(desc); - done = true; - }}, + /* mark backend as not ready */ + dynamic_cast(s_mplexer.get())->setNotReady(desc); + done = true; + }}, {ExpectedStep::ExpectedRequest::closeBackend, IOState::Done}, }; @@ -1547,10 +1547,10 @@ BOOST_FIXTURE_TEST_CASE(test_ConnectionClosedWhileWriting, TestFixture) {ExpectedStep::ExpectedRequest::readFromBackend, IOState::Done, std::numeric_limits::max()}, /* acknowledge settings */ {ExpectedStep::ExpectedRequest::writeToBackend, IOState::Done, std::numeric_limits::max(), [&done](int desc, const ExpectedStep& step) { - /* mark backend as not ready */ - dynamic_cast(s_mplexer.get())->setNotReady(desc); - done = true; - }}, + /* mark backend as not ready */ + dynamic_cast(s_mplexer.get())->setNotReady(desc); + done = true; + }}, {ExpectedStep::ExpectedRequest::closeBackend, IOState::Done}, }; @@ -1751,10 +1751,10 @@ BOOST_FIXTURE_TEST_CASE(test_HTTP500FromServer, TestFixture) {ExpectedStep::ExpectedRequest::readFromBackend, IOState::Done, std::numeric_limits::max()}, /* acknowledge settings */ {ExpectedStep::ExpectedRequest::writeToBackend, IOState::Done, std::numeric_limits::max(), [&done](int desc, const ExpectedStep& step) { - /* mark backend as not ready */ - dynamic_cast(s_mplexer.get())->setNotReady(desc); - done = true; - }}, + /* mark backend as not ready */ + dynamic_cast(s_mplexer.get())->setNotReady(desc); + done = true; + }}, {ExpectedStep::ExpectedRequest::closeBackend, IOState::Done}, };