Mercurial > irccd

changeset 734:649bb151f40d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Irccd: use std::error_code everywhere
author David Demelier <markand@malikania.fr>
date Tue, 24 Jul 2018 21:45:00 +0200
parents bd12709b1975
children 64839725f346
files libirccd-core/irccd/socket_acceptor.hpp libirccd-core/irccd/socket_connector.hpp libirccd-core/irccd/socket_stream.hpp libirccd-core/irccd/tls_acceptor.hpp libirccd-core/irccd/tls_connector.hpp libirccd/irccd/daemon/irc.hpp libirccd/irccd/daemon/irccd.hpp libirccd/irccd/daemon/plugin.hpp libirccd/irccd/daemon/rule.hpp libirccd/irccd/daemon/server.cpp libirccd/irccd/daemon/server.hpp libirccd/irccd/daemon/transport_server.hpp
diffstat 12 files changed, 27 insertions(+), 50 deletions(-) [+]
line wrap: on
line diff
--- a/libirccd-core/irccd/socket_acceptor.hpp	Tue Jul 24 21:30:00 2018 +0200
+++ b/libirccd-core/irccd/socket_acceptor.hpp	Tue Jul 24 21:45:00 2018 +0200
@@ -123,7 +123,7 @@
 #if !defined(NDEBUG)
         is_accepting_ = false;
 #endif
-        handler(detail::convert(code));
+        handler(code);
     });
 }
 
--- a/libirccd-core/irccd/socket_connector.hpp	Tue Jul 24 21:30:00 2018 +0200
+++ b/libirccd-core/irccd/socket_connector.hpp	Tue Jul 24 21:45:00 2018 +0200
@@ -137,7 +137,7 @@
         if (ep == endpoints_.end())
             handler(make_error_code(std::errc::host_unreachable));
         else
-            handler(detail::convert(code));
+            handler(code);
     });
 }
 
--- a/libirccd-core/irccd/socket_stream.hpp	Tue Jul 24 21:30:00 2018 +0200
+++ b/libirccd-core/irccd/socket_stream.hpp	Tue Jul 24 21:45:00 2018 +0200
@@ -39,29 +39,6 @@
 namespace irccd::io {
 
 /**
- * \cond HIDDEN_SYMBOLS
- */
-
-namespace detail {
-
-/**
- * Convert boost::system::error_code to std.
- *
- * \param code the error code
- * \return the std::error_code
- */
-inline auto convert(boost::system::error_code code) noexcept -> std::error_code
-{
-    return std::error_code(code.value(), std::system_category());
-}
-
-} // !detail
-
-/**
- * \endcond
- */
-
-/**
  * \brief Socket implementation interface.
  * \tparam Socket the Boost.Asio compatible socket.
  *
@@ -79,8 +56,8 @@
     bool is_sending_{false};
 #endif
 
-    void handle_read(boost::system::error_code, std::size_t, read_handler);
-    void handle_write(boost::system::error_code, std::size_t, write_handler);
+    void handle_read(std::error_code, std::size_t, read_handler);
+    void handle_write(std::error_code, std::size_t, write_handler);
 
 public:
     /**
@@ -126,7 +103,7 @@
 };
 
 template <typename Socket>
-void socket_stream<Socket>::handle_read(boost::system::error_code code,
+void socket_stream<Socket>::handle_read(std::error_code code,
                                         std::size_t xfer,
                                         read_handler handler)
 {
@@ -139,7 +116,7 @@
         return;
     }
     if (code) {
-        handler(detail::convert(code), nullptr);
+        handler(code, nullptr);
         return;
     }
 
@@ -175,7 +152,7 @@
 }
 
 template <typename Socket>
-void socket_stream<Socket>::handle_write(boost::system::error_code code,
+void socket_stream<Socket>::handle_write(std::error_code code,
                                          std::size_t xfer,
                                          write_handler handler)
 {
@@ -186,7 +163,7 @@
     if (xfer == 0)
         handler(make_error_code(std::errc::not_connected));
     else
-        handler(detail::convert(code));
+        handler(code);
 }
 
 template <typename Socket>
--- a/libirccd-core/irccd/tls_acceptor.hpp	Tue Jul 24 21:30:00 2018 +0200
+++ b/libirccd-core/irccd/tls_acceptor.hpp	Tue Jul 24 21:45:00 2018 +0200
@@ -80,7 +80,7 @@
         }
 
         client->get_socket().async_handshake(stream_base::server, [handler, client] (auto code) {
-            handler(detail::convert(code), code ? nullptr : std::move(client));
+            handler(code, code ? nullptr : std::move(client));
         });
     });
 }
--- a/libirccd-core/irccd/tls_connector.hpp	Tue Jul 24 21:30:00 2018 +0200
+++ b/libirccd-core/irccd/tls_connector.hpp	Tue Jul 24 21:45:00 2018 +0200
@@ -79,7 +79,7 @@
         }
 
         stream->get_socket().async_handshake(stream_base::client, [handler, stream] (auto code) {
-            handler(detail::convert(code), code ? nullptr : std::move(stream));
+            handler(code, code ? nullptr : std::move(stream));
         });
     });
 }
--- a/libirccd/irccd/daemon/irc.hpp	Tue Jul 24 21:30:00 2018 +0200
+++ b/libirccd/irccd/daemon/irc.hpp	Tue Jul 24 21:45:00 2018 +0200
@@ -361,17 +361,17 @@
     /**
      * Handler for connecting.
      */
-    using connect_handler = std::function<void (boost::system::error_code)>;
+    using connect_handler = std::function<void (std::error_code)>;
 
     /**
      * Handler for receiving.
      */
-    using recv_handler = std::function<void (boost::system::error_code, message)>;
+    using recv_handler = std::function<void (std::error_code, message)>;
 
     /**
      * Handler for sending.
      */
-    using send_handler = std::function<void (boost::system::error_code)>;
+    using send_handler = std::function<void (std::error_code)>;
 
 private:
     boost::asio::ip::tcp::resolver resolver_;
--- a/libirccd/irccd/daemon/irccd.hpp	Tue Jul 24 21:30:00 2018 +0200
+++ b/libirccd/irccd/daemon/irccd.hpp	Tue Jul 24 21:45:00 2018 +0200
@@ -261,7 +261,7 @@
 const std::error_category& irccd_category();
 
 /**
- * Create a boost::system::error_code from irccd_error::error enum.
+ * Create a std::error_code from irccd_error::error enum.
  *
  * \param e the error code
  */
--- a/libirccd/irccd/daemon/plugin.hpp	Tue Jul 24 21:30:00 2018 +0200
+++ b/libirccd/irccd/daemon/plugin.hpp	Tue Jul 24 21:45:00 2018 +0200
@@ -443,7 +443,7 @@
 auto plugin_category() -> const std::error_category&;
 
 /**
- * Create a boost::system::error_code from plugin_error::error enum.
+ * Create a std::error_code from plugin_error::error enum.
  *
  * \param e the error code
  */
--- a/libirccd/irccd/daemon/rule.hpp	Tue Jul 24 21:30:00 2018 +0200
+++ b/libirccd/irccd/daemon/rule.hpp	Tue Jul 24 21:45:00 2018 +0200
@@ -256,7 +256,7 @@
 const std::error_category& rule_category();
 
 /**
- * Create a boost::system::error_code from rule_error::error enum.
+ * Create a std::error_code from rule_error::error enum.
  *
  * \param e the error code
  */
--- a/libirccd/irccd/daemon/server.cpp	Tue Jul 24 21:30:00 2018 +0200
+++ b/libirccd/irccd/daemon/server.cpp	Tue Jul 24 21:45:00 2018 +0200
@@ -379,7 +379,7 @@
         dispatch_whoisuser(message);
 }
 
-void server::handle_send(const boost::system::error_code& code)
+void server::handle_send(const std::error_code& code)
 {
     /*
      * We don't notify server_service in case of error because in any case the
@@ -391,7 +391,7 @@
         flush();
 }
 
-void server::handle_recv(const boost::system::error_code& code,
+void server::handle_recv(const std::error_code& code,
                          const irc::message& message,
                          const recv_handler& handler)
 {
@@ -432,13 +432,13 @@
     send(str(format("USER %1% unknown unknown :%2%") % username_ % realname_));
 }
 
-void server::handle_wait(const boost::system::error_code& code, const connect_handler& handler)
+void server::handle_wait(const std::error_code& code, const connect_handler& handler)
 {
-    if (code && code != boost::asio::error::operation_aborted)
+    if (code && code != std::errc::operation_canceled)
         handler(code);
 }
 
-void server::handle_connect(const boost::system::error_code& code, const connect_handler& handler)
+void server::handle_connect(const std::error_code& code, const connect_handler& handler)
 {
     timer_.cancel();
 
--- a/libirccd/irccd/daemon/server.hpp	Tue Jul 24 21:30:00 2018 +0200
+++ b/libirccd/irccd/daemon/server.hpp	Tue Jul 24 21:45:00 2018 +0200
@@ -329,10 +329,10 @@
     // I/O and connection.
     void flush();
     void identify();
-    void handle_send(const boost::system::error_code&);
-    void handle_recv(const boost::system::error_code&, const irc::message&, const recv_handler&);
-    void handle_wait(const boost::system::error_code&, const connect_handler&);
-    void handle_connect(const boost::system::error_code&, const connect_handler&);
+    void handle_send(const std::error_code&);
+    void handle_recv(const std::error_code&, const irc::message&, const recv_handler&);
+    void handle_wait(const std::error_code&, const connect_handler&);
+    void handle_connect(const std::error_code&, const connect_handler&);
 
 public:
     /**
@@ -852,7 +852,7 @@
 auto server_category() -> const std::error_category&;
 
 /**
- * Create a boost::system::error_code from server_error::error enum.
+ * Create a std::error_code from server_error::error enum.
  *
  * \param e the error code
  */
--- a/libirccd/irccd/daemon/transport_server.hpp	Tue Jul 24 21:30:00 2018 +0200
+++ b/libirccd/irccd/daemon/transport_server.hpp	Tue Jul 24 21:45:00 2018 +0200
@@ -274,7 +274,7 @@
 const std::error_category& transport_category() noexcept;
 
 /**
- * Create a boost::system::error_code from server_error::error enum.
+ * Create a std::error_code from server_error::error enum.
  *
  * \param e the error code
  */