Style, comments.

Author: evoskuil

include/bitcoin/protocol/web/utilities.hpp

@@ -27,7 +27,6 @@
     #include <windows.h>
 #endif
 
-#include <boost/algorithm/string.hpp>
 #include <boost/filesystem.hpp>
 #include <bitcoin/system.hpp>
 #include <bitcoin/protocol/web/http.hpp>

include/bitcoin/protocol/web/websocket_frame.hpp

@@ -33,10 +33,10 @@ namespace http {
 class BCP_API websocket_frame
 {
 public:
-    websocket_frame(const uint8_t* data, size_t size);
-
     static system::data_chunk to_header(size_t length, websocket_op code);
 
+    websocket_frame(const uint8_t* data, size_t size);
+
     operator bool() const;
     bool final() const;
     bool fragment() const;
@@ -50,7 +50,6 @@ class BCP_API websocket_frame
 private:
     void from_data(const uint8_t* data, size_t read_length);
 
-private:
     static const size_t mask_ = 4;
 
     bool valid_;

include/bitcoin/protocol/web/websocket_op.hpp

@@ -25,14 +25,14 @@ namespace libbitcoin {
 namespace protocol {
 namespace http {
 
-enum class websocket_op : uint8_t
+enum class websocket_op: uint8_t
 {
     continuation = 0,
     text = 1,
     binary = 2,
     close = 8,
     ping = 9,
-    pong = 10,
+    pong = 10
 };
 
 } // namespace http

include/bitcoin/protocol/web/websocket_transfer.hpp

@@ -20,7 +20,6 @@
 #define LIBBITCOIN_PROTOCOL_WEB_WEBSOCKET_TRANSFER_HPP
 
 #include <cstddef>
-#include <cstdint>
 #include <bitcoin/system.hpp>
 #include <bitcoin/protocol/define.hpp>
 

src/web/connection.cpp

@@ -18,6 +18,8 @@
  */
 #include <bitcoin/protocol/web/connection.hpp>
 
+ // TODO: include other headers.
+
 namespace libbitcoin {
 namespace protocol {
 namespace http {
@@ -28,7 +30,7 @@ static constexpr size_t maximum_read_length = 1024;
 static constexpr size_t high_water_mark = 2 * 1024 * 1024;
 
 connection::connection()
-  : connection(0, sockaddr_in{})
+  : connection(0, {})
 {
 }
 
@@ -105,7 +107,7 @@ int32_t connection::read()
 #ifdef WITH_MBEDTLS
     bytes_read_ = (ssl_context_.enabled ?
         mbedtls_ssl_read(&ssl_context_.context, data, maximum_read_length) :
-        recv(socket_, data, maximum_read_length, 0));
+            recv(socket_, data, maximum_read_length, 0));
 #else
     bytes_read_ = recv(socket_, data, maximum_read_length, 0);
 #endif

src/web/json_string.cpp

@@ -22,9 +22,12 @@
 // boost parsing helpers included from json_parser.hpp.
 // See: https://svn.boost.org/trac10/ticket/12621
 using namespace std::placeholders;
+
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/property_tree/ptree.hpp>
 
+// TODO: include other headers.
+
 namespace libbitcoin {
 namespace protocol {
 namespace http {

src/web/manager.cpp

@@ -18,6 +18,8 @@
  */
 #include <bitcoin/protocol/web/manager.hpp>
 
+ // TODO: include other headers.
+
 #ifdef WITH_MBEDTLS
 extern "C"
 {

src/web/socket.cpp

@@ -18,6 +18,8 @@
  */
 #include <bitcoin/protocol/web/socket.hpp>
 
+ // TODO: include other headers.
+
 namespace libbitcoin {
 namespace protocol {
 namespace http {

src/web/utilities.cpp

@@ -18,6 +18,9 @@
  */
 #include <bitcoin/protocol/web/utilities.hpp>
 
+ // TODO: include other headers.
+#include <boost/algorithm/string.hpp>
+
 namespace libbitcoin {
 namespace protocol {
 namespace http {
@@ -91,8 +94,7 @@ std::string websocket_key_response(const std::string& websocket_key)
 
     const auto input = websocket_key + rfc6455_guid;
     const data_chunk input_data(input.begin(), input.end());
-    const data_slice slice(system::sha1_hash(input_data));
-    return encode_base64(slice);
+    return encode_base64(system::sha1_hash(input_data));
 }
 
 bool is_json_request(const std::string& header_value)
@@ -115,7 +117,7 @@ bool parse_http(http_request& out, const std::string& request)
     if (position == std::string::npos)
         return false;
 
-    std::string method_line = request.substr(0, position);
+    const auto method_line = request.substr(0, position);
     string_list elements;
     boost::split(elements, method_line, boost::is_any_of(" "));
     if (elements.size() != 3)

src/web/websocket_frame.cpp

@@ -18,6 +18,8 @@
  */
 #include <bitcoin/protocol/web/connection.hpp>
 
+ // TODO: include other headers.
+
 namespace libbitcoin {
 namespace protocol {
 namespace http {