From bdeb4ad680c5f2167f0ac9725206e2d8ce9bec22 Mon Sep 17 00:00:00 2001 From: Peter Thorson Date: Sun, 2 Mar 2014 21:39:34 -0600 Subject: [PATCH] code style and documentation --- websocketpp/impl/connection_impl.hpp | 14 ++++++-------- websocketpp/transport/asio/connection.hpp | 12 ++++++------ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/websocketpp/impl/connection_impl.hpp b/websocketpp/impl/connection_impl.hpp index 6f3365d8b3..41260c6192 100644 --- a/websocketpp/impl/connection_impl.hpp +++ b/websocketpp/impl/connection_impl.hpp @@ -1204,9 +1204,7 @@ void connection::send_http_response() { } template -void connection::handle_send_http_response( - const lib::error_code& ec) -{ +void connection::handle_send_http_response(lib::error_code const & ec) { m_alog.write(log::alevel::devel,"handle_send_http_response"); this->atomic_state_check( @@ -1318,7 +1316,7 @@ void connection::send_http_request() { } template -void connection::handle_send_http_request(const lib::error_code& ec) { +void connection::handle_send_http_request(lib::error_code const & ec) { m_alog.write(log::alevel::devel,"handle_send_http_request"); this->atomic_state_check( @@ -1438,13 +1436,13 @@ void connection::handle_open_handshake_timeout( lib::error_code const & ec) { if (ec == transport::error::operation_aborted) { - m_alog.write(log::alevel::devel,"asio open handshake timer cancelled"); + m_alog.write(log::alevel::devel,"open handshake timer cancelled"); } else if (ec) { m_alog.write(log::alevel::devel, - "asio open handle_open_handshake_timeout error: "+ec.message()); + "open handle_open_handshake_timeout error: "+ec.message()); // TODO: ignore or fail here? } else { - m_alog.write(log::alevel::devel,"asio open handshake timer expired"); + m_alog.write(log::alevel::devel,"open handshake timer expired"); terminate(make_error_code(error::open_handshake_timeout)); } } @@ -1542,7 +1540,7 @@ void connection::handle_terminate(terminate_status tstat, if (m_termination_handler) { try { m_termination_handler(type::get_shared()); - } catch (const std::exception& e) { + } catch (std::exception const & e) { m_elog.write(log::elevel::warn, std::string("termination_handler call failed. Reason was: ")+e.what()); } diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp index a4ed4d133a..72b7d71ad3 100644 --- a/websocketpp/transport/asio/connection.hpp +++ b/websocketpp/transport/asio/connection.hpp @@ -498,7 +498,7 @@ protected: } void handle_post_init_timeout(timer_ptr post_timer, init_handler callback, - const lib::error_code& ec) + lib::error_code const & ec) { lib::error_code ret_ec; @@ -524,8 +524,8 @@ protected: callback(ret_ec); } - void handle_post_init(timer_ptr post_timer, init_handler callback, const - lib::error_code& ec) + void handle_post_init(timer_ptr post_timer, init_handler callback, + lib::error_code const & ec) { if (ec == transport::error::operation_aborted || post_timer->expires_from_now().is_negative()) @@ -965,7 +965,7 @@ protected: } void handle_async_shutdown_timeout(timer_ptr shutdown_timer, init_handler - callback, const lib::error_code& ec) + callback, lib::error_code const & ec) { lib::error_code ret_ec; @@ -976,7 +976,7 @@ protected: return; } - log_err(log::elevel::devel,"asio handle_async_socket_shutdown",ec); + log_err(log::elevel::devel,"asio handle_async_shutdown_timeout",ec); ret_ec = ec; } else { ret_ec = make_error_code(transport::error::timeout); @@ -989,7 +989,7 @@ protected: } void handle_async_shutdown(timer_ptr shutdown_timer, shutdown_handler - callback, const boost::system::error_code & ec) + callback, boost::system::error_code const & ec) { if (ec == boost::asio::error::operation_aborted || shutdown_timer->expires_from_now().is_negative())