From e326a663f608e495a34d214e6d30e6770b15af56 Mon Sep 17 00:00:00 2001 From: Chunting Gu Date: Wed, 29 May 2019 11:11:41 +0800 Subject: [PATCH] Refine coding style --- webcc/socket.cc | 11 ++++++----- webcc/socket.h | 18 ++++++------------ 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/webcc/socket.cc b/webcc/socket.cc index 493c100..6ae3b84 100644 --- a/webcc/socket.cc +++ b/webcc/socket.cc @@ -3,6 +3,7 @@ #include "boost/asio/connect.hpp" #include "boost/asio/read.hpp" #include "boost/asio/write.hpp" +#include "boost/core/ignore_unused.hpp" #include "webcc/logger.h" @@ -14,14 +15,14 @@ Socket::Socket(boost::asio::io_context& io_context) : socket_(io_context) { } -void Socket::Connect(const std::string& /*host*/, - const Endpoints& endpoints, - boost::system::error_code* ec) { +void Socket::Connect(const std::string& host, const Endpoints& endpoints, + boost::system::error_code* ec) { + boost::ignore_unused(host); + boost::asio::connect(socket_, endpoints, *ec); } -void Socket::Write(const Request& request, - boost::system::error_code* ec) { +void Socket::Write(const Request& request, boost::system::error_code* ec) { boost::asio::write(socket_, request.payload(), *ec); } diff --git a/webcc/socket.h b/webcc/socket.h index 2d6f3ec..8cbd1f6 100644 --- a/webcc/socket.h +++ b/webcc/socket.h @@ -26,12 +26,10 @@ public: std::function; // TODO: Remove |host| - virtual void Connect(const std::string& host, - const Endpoints& endpoints, + virtual void Connect(const std::string& host, const Endpoints& endpoints, boost::system::error_code* ec) = 0; - virtual void Write(const Request& request, - boost::system::error_code* ec) = 0; + virtual void Write(const Request& request, boost::system::error_code* ec) = 0; virtual void AsyncReadSome(ReadHandler&& handler, std::vector* buffer) = 0; @@ -45,12 +43,10 @@ class Socket : public SocketBase { public: explicit Socket(boost::asio::io_context& io_context); - void Connect(const std::string& host, - const Endpoints& endpoints, + void Connect(const std::string& host, const Endpoints& endpoints, boost::system::error_code* ec) override; - void Write(const Request& request, - boost::system::error_code* ec) override; + void Write(const Request& request, boost::system::error_code* ec) override; void AsyncReadSome(ReadHandler&& handler, std::vector* buffer) override; @@ -69,12 +65,10 @@ public: explicit SslSocket(boost::asio::io_context& io_context, bool ssl_verify = true); - void Connect(const std::string& host, - const Endpoints& endpoints, + void Connect(const std::string& host, const Endpoints& endpoints, boost::system::error_code* ec) override; - void Write(const Request& request, - boost::system::error_code* ec) override; + void Write(const Request& request, boost::system::error_code* ec) override; void AsyncReadSome(ReadHandler&& handler, std::vector* buffer) override;