From 13144a08e496b89b34093ffd3d810d3442df3c44 Mon Sep 17 00:00:00 2001 From: peterbell10 Date: Thu, 14 May 2020 23:15:35 +0100 Subject: Enable some more clang-tidy linter checks (#4738) * Avoid inefficient AString -> c_str() -> AString round trip * Avoid redundant string init expressions * Avoid unnecessary return, continue, etc. * Add .clang-format to help with clang-tidy fix-its * Avoid unnecessary passing by value * Avoid unnecessary local copying * Avoid copying in range-for loops * Avoid over-complicated boolean expressions * Some violations missed by my local clang-tidy * Allow unnecessary continue statements * Add brackets * Another expression missed locally * Move BindingsProcessor call into clang-tidy.sh and add space * Fix pushd not found error * Different grouping of CheckBlockInteractionRate --- src/HTTP/HTTPMessage.h | 2 +- src/HTTP/HTTPServer.cpp | 4 ++-- src/HTTP/SslHTTPServerConnection.cpp | 4 +++- src/HTTP/SslHTTPServerConnection.h | 2 +- src/HTTP/UrlClient.cpp | 6 +++--- src/HTTP/UrlClient.h | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) (limited to 'src/HTTP') diff --git a/src/HTTP/HTTPMessage.h b/src/HTTP/HTTPMessage.h index 20deab5ab..f73957748 100644 --- a/src/HTTP/HTTPMessage.h +++ b/src/HTTP/HTTPMessage.h @@ -126,7 +126,7 @@ public: bool DoesAllowKeepAlive(void) const { return m_AllowKeepAlive; } /** Attaches any kind of data to this request, to be later retrieved by GetUserData(). */ - void SetUserData(cUserDataPtr a_UserData) { m_UserData = a_UserData; } + void SetUserData(cUserDataPtr a_UserData) { m_UserData = std::move(a_UserData); } /** Returns the data attached to this request by the class client. */ cUserDataPtr GetUserData(void) { return m_UserData; } diff --git a/src/HTTP/HTTPServer.cpp b/src/HTTP/HTTPServer.cpp index e499d98dc..42e1159ac 100644 --- a/src/HTTP/HTTPServer.cpp +++ b/src/HTTP/HTTPServer.cpp @@ -137,7 +137,7 @@ bool cHTTPServer::Start(cCallbacks & a_Callbacks, const AStringVector & a_Ports) // Open up requested ports: AStringVector ports; - for (auto port : a_Ports) + for (const auto & port : a_Ports) { UInt16 PortNum; if (!StringToInteger(port, PortNum)) @@ -175,7 +175,7 @@ bool cHTTPServer::Start(cCallbacks & a_Callbacks, const AStringVector & a_Ports) void cHTTPServer::Stop(void) { - for (auto handle : m_ServerHandles) + for (const auto & handle : m_ServerHandles) { handle->Close(); } diff --git a/src/HTTP/SslHTTPServerConnection.cpp b/src/HTTP/SslHTTPServerConnection.cpp index 4f1ef81d2..b6f9f246a 100644 --- a/src/HTTP/SslHTTPServerConnection.cpp +++ b/src/HTTP/SslHTTPServerConnection.cpp @@ -11,7 +11,9 @@ -cSslHTTPServerConnection::cSslHTTPServerConnection(cHTTPServer & a_HTTPServer, std::shared_ptr a_Config): +cSslHTTPServerConnection::cSslHTTPServerConnection( + cHTTPServer & a_HTTPServer, const std::shared_ptr & a_Config +): Super(a_HTTPServer), m_Ssl(64000) { diff --git a/src/HTTP/SslHTTPServerConnection.h b/src/HTTP/SslHTTPServerConnection.h index ae15398bf..157aa9326 100644 --- a/src/HTTP/SslHTTPServerConnection.h +++ b/src/HTTP/SslHTTPServerConnection.h @@ -25,7 +25,7 @@ public: /** Creates a new connection on the specified server. Sends the specified cert as the server certificate, uses the private key for decryption. */ - cSslHTTPServerConnection(cHTTPServer & a_HTTPServer, std::shared_ptr a_Config); + cSslHTTPServerConnection(cHTTPServer & a_HTTPServer, const std::shared_ptr & a_Config); virtual ~cSslHTTPServerConnection() override; diff --git a/src/HTTP/UrlClient.cpp b/src/HTTP/UrlClient.cpp index 9ee453321..315856f69 100644 --- a/src/HTTP/UrlClient.cpp +++ b/src/HTTP/UrlClient.cpp @@ -159,7 +159,7 @@ protected: } - std::pair DoRequest(std::shared_ptr a_Self); + std::pair DoRequest(const std::shared_ptr & a_Self); // cNetwork::cConnectCallbacks override: TCP link connected: @@ -572,7 +572,7 @@ void cUrlClientRequest::OnRemoteClosed() -std::pair cUrlClientRequest::DoRequest(std::shared_ptr a_Self) +std::pair cUrlClientRequest::DoRequest(const std::shared_ptr & a_Self) { // We need a shared pointer to self, care must be taken not to pass any other ptr: ASSERT(a_Self.get() == this); @@ -630,7 +630,7 @@ std::pair cUrlClient::Get( const AString & a_URL, cCallbacksPtr && a_Callbacks, AStringMap a_Headers, - AString a_Body, + const AString & a_Body, AStringMap a_Options ) { diff --git a/src/HTTP/UrlClient.h b/src/HTTP/UrlClient.h index 02c7cb89c..5f737b057 100644 --- a/src/HTTP/UrlClient.h +++ b/src/HTTP/UrlClient.h @@ -124,7 +124,7 @@ public: const AString & a_URL, cCallbacksPtr && a_Callbacks, AStringMap a_Headers = AStringMap(), - AString a_Body = AString(), + const AString & a_Body = AString(), AStringMap a_Options = AStringMap() ); -- cgit v1.2.3