1 files changed, 45 insertions, 41 deletions

diff --git a/server/include/socket_wraper.h b/server/include/socket_wraper.h
index ed929ca..6e8dd76 100644
--- a/server/include/socket_wraper.h
+++ b/server/include/socket_wraper.h
@@ -1,5 +1,5 @@
 /*
-	Copyright © 2015 Gluzskiy Alexandr (sss)
+        Copyright © 2015 Gluzskiy Alexandr (sss)
 
     This file is part of Unknown Download Manager (UDM).
 
@@ -27,79 +27,83 @@
 class socket_wraper
 {
 public:
-    socket_wraper(boost::asio::ssl::stream<boost::asio::ip::tcp::socket> *s) : is_ssl(true)
+    socket_wraper(boost::asio::ssl::stream<boost::asio::ip::tcp::socket>* s)
+        : is_ssl(true)
     {
-        socket_ssl_ = s;
+	socket_ssl_ = s;
     }
 
-    socket_wraper(boost::asio::ip::tcp::socket *s) : is_ssl(false)
+    socket_wraper(boost::asio::ip::tcp::socket* s)
+        : is_ssl(false)
     {
-        socket_ = s;
+	socket_ = s;
     }
 
-    void operator=(boost::asio::ssl::stream<boost::asio::ip::tcp::socket> *s)
+    void operator=(boost::asio::ssl::stream<boost::asio::ip::tcp::socket>* s)
     {
-        socket_ssl_ = s;
-        is_ssl = true;
+	socket_ssl_ = s;
+	is_ssl = true;
     }
-    void operator=(boost::asio::ip::tcp::socket *s)
+    void operator=(boost::asio::ip::tcp::socket* s)
     {
-        socket_ = s;
-        is_ssl = false;
+	socket_ = s;
+	is_ssl = false;
     }
 
     boost::asio::ip::tcp::socket& get_socket()
     {
-        return *socket_;
+	return *socket_;
     }
 
     boost::asio::ssl::stream<boost::asio::ip::tcp::socket>& get_ssl_socket()
     {
-        return *socket_ssl_;
+	return *socket_ssl_;
     }
-    template<typename MutableBufferSequence> std::size_t read_some(const MutableBufferSequence & buffers)
+    template <typename MutableBufferSequence> std::size_t read_some(const MutableBufferSequence& buffers)
     {
-        if(is_ssl)
-            return socket_ssl_->read_some(buffers);
-        else
-            return socket_->read_some(buffers);
+	if(is_ssl)
+	    return socket_ssl_->read_some(buffers);
+	else
+	    return socket_->read_some(buffers);
     }
-    template<typename MutableBufferSequence> std::size_t read_some(const MutableBufferSequence & buffers, boost::system::error_code & ec)
+    template <typename MutableBufferSequence>
+    std::size_t read_some(const MutableBufferSequence& buffers, boost::system::error_code& ec)
     {
-        if(is_ssl)
-            return socket_ssl_->read_some(buffers, ec);
-        else
-            return socket_->read_some(buffers, ec);
+	if(is_ssl)
+	    return socket_ssl_->read_some(buffers, ec);
+	else
+	    return socket_->read_some(buffers, ec);
     }
 
-    template<typename MutableBufferSequence, typename ReadHandler>  void async_read_some(const MutableBufferSequence & buffers, ReadHandler handler)
+    template <typename MutableBufferSequence, typename ReadHandler>
+    void async_read_some(const MutableBufferSequence& buffers, ReadHandler handler)
     {
-        if(is_ssl)
-            socket_ssl_->async_read_some(buffers, handler);
-        else
-            socket_->async_read_some(buffers, handler);
+	if(is_ssl)
+	    socket_ssl_->async_read_some(buffers, handler);
+	else
+	    socket_->async_read_some(buffers, handler);
     }
 
-    template<typename ConstBufferSequence, typename WriteHandler> void async_write_some(const ConstBufferSequence & buffers, WriteHandler handler)
+    template <typename ConstBufferSequence, typename WriteHandler>
+    void async_write_some(const ConstBufferSequence& buffers, WriteHandler handler)
     {
-        if(is_ssl)
-            socket_ssl_->async_write_some(buffers, handler);
-        else
-            socket_->async_write_some(buffers, handler);
+	if(is_ssl)
+	    socket_ssl_->async_write_some(buffers, handler);
+	else
+	    socket_->async_write_some(buffers, handler);
     }
     ~socket_wraper()
     {
-        if(is_ssl)
-            delete socket_ssl_;
-        else
-            delete socket_;
+	if(is_ssl)
+	    delete socket_ssl_;
+	else
+	    delete socket_;
     }
+
 private:
     bool is_ssl;
-    boost::asio::ip::tcp::socket *socket_;
-    boost::asio::ssl::stream<boost::asio::ip::tcp::socket> *socket_ssl_;
-
+    boost::asio::ip::tcp::socket* socket_ = nullptr;
+    boost::asio::ssl::stream<boost::asio::ip::tcp::socket>* socket_ssl_ = nullptr;
 };
 
-
 #endif