From 732f53d798c86558e1e625c22e957243bb2d6467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Fri, 18 Nov 2016 20:54:41 +0100 Subject: Clean a few more things --- louloulibs/network/dns_handler.cpp | 1 - louloulibs/network/dns_handler.hpp | 3 ++- louloulibs/network/tcp_socket_handler.hpp | 4 ++-- src/identd/identd_socket.hpp | 7 ------- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/louloulibs/network/dns_handler.cpp b/louloulibs/network/dns_handler.cpp index fef0cfc..b1807b5 100644 --- a/louloulibs/network/dns_handler.cpp +++ b/louloulibs/network/dns_handler.cpp @@ -8,7 +8,6 @@ #include #include -#include DNSHandler DNSHandler::instance; diff --git a/louloulibs/network/dns_handler.hpp b/louloulibs/network/dns_handler.hpp index fd1729d..53a7799 100644 --- a/louloulibs/network/dns_handler.hpp +++ b/louloulibs/network/dns_handler.hpp @@ -20,8 +20,9 @@ class DNSSocketHandler; class DNSHandler { -public: +private: DNSHandler(); +public: ~DNSHandler() = default; DNSHandler(const DNSHandler&) = delete; DNSHandler(DNSHandler&&) = delete; diff --git a/louloulibs/network/tcp_socket_handler.hpp b/louloulibs/network/tcp_socket_handler.hpp index c33c8f2..5863d4a 100644 --- a/louloulibs/network/tcp_socket_handler.hpp +++ b/louloulibs/network/tcp_socket_handler.hpp @@ -204,8 +204,8 @@ protected: /** * Called when we detect a disconnection from the remote host. */ - virtual void on_connection_close(const std::string& error) = 0; - virtual void on_connection_failed(const std::string& error) = 0; + virtual void on_connection_close(const std::string&) {} + virtual void on_connection_failed(const std::string&) {} private: #ifdef BOTAN_FOUND diff --git a/src/identd/identd_socket.hpp b/src/identd/identd_socket.hpp index 98077f2..1c2bd27 100644 --- a/src/identd/identd_socket.hpp +++ b/src/identd/identd_socket.hpp @@ -22,8 +22,6 @@ class IdentdSocket: public TCPSocketHandler std::string generate_answer(const BiboumiComponent& biboumi, uint16_t local, uint16_t remote); void parse_in_buffer(const std::size_t size) override final; - void on_connection_close(const std::string&) override final - {} bool is_connected() const override final { @@ -35,10 +33,5 @@ class IdentdSocket: public TCPSocketHandler } private: - void connect() override - { assert(false); } - void on_connection_failed(const std::string&) override final - { assert(false); } - IdentdServer& server; }; -- cgit v1.2.3