From 30ba113f9d66611bdb838c361b3e47350aae1391 Mon Sep 17 00:00:00 2001 From: Lee Bousfield Date: Fri, 13 Jul 2018 16:51:30 -0600 Subject: [PATCH] Initialize booleans when not explicitly set (#971) --- rai/core_test/block.cpp | 24 ++++++++++++------------ rai/lib/blocks.cpp | 20 ++++++++++---------- rai/node/bootstrap.cpp | 3 +-- rai/node/common.cpp | 2 +- rai/node/rpc.cpp | 1 - rai/node/rpc_secure.cpp | 2 -- rai/qt_test/qt.cpp | 8 ++++---- 7 files changed, 28 insertions(+), 32 deletions(-) diff --git a/rai/core_test/block.cpp b/rai/core_test/block.cpp index 4871e352..875774bc 100644 --- a/rai/core_test/block.cpp +++ b/rai/core_test/block.cpp @@ -48,7 +48,7 @@ TEST (block, send_serialize) ASSERT_NE (nullptr, data); ASSERT_NE (0, size); rai::bufferstream stream2 (data, size); - bool error; + bool error (false); rai::send_block block2 (error, stream2); ASSERT_FALSE (error); ASSERT_EQ (block1, block2); @@ -63,7 +63,7 @@ TEST (block, send_serialize_json) boost::property_tree::ptree tree1; std::stringstream istream (string1); boost::property_tree::read_json (istream, tree1); - bool error; + bool error (false); rai::send_block block2 (error, tree1); ASSERT_FALSE (error); ASSERT_EQ (block1, block2); @@ -79,7 +79,7 @@ TEST (block, receive_serialize) block1.serialize (stream1); } rai::bufferstream stream2 (bytes.data (), bytes.size ()); - bool error; + bool error (false); rai::receive_block block2 (error, stream2); ASSERT_FALSE (error); ASSERT_EQ (block1, block2); @@ -94,7 +94,7 @@ TEST (block, receive_serialize_json) boost::property_tree::ptree tree1; std::stringstream istream (string1); boost::property_tree::read_json (istream, tree1); - bool error; + bool error (false); rai::receive_block block2 (error, tree1); ASSERT_FALSE (error); ASSERT_EQ (block1, block2); @@ -109,7 +109,7 @@ TEST (block, open_serialize_json) boost::property_tree::ptree tree1; std::stringstream istream (string1); boost::property_tree::read_json (istream, tree1); - bool error; + bool error (false); rai::open_block block2 (error, tree1); ASSERT_FALSE (error); ASSERT_EQ (block1, block2); @@ -124,7 +124,7 @@ TEST (block, change_serialize_json) boost::property_tree::ptree tree1; std::stringstream istream (string1); boost::property_tree::read_json (istream, tree1); - bool error; + bool error (false); rai::change_block block2 (error, tree1); ASSERT_FALSE (error); ASSERT_EQ (block1, block2); @@ -208,7 +208,7 @@ TEST (send_block, deserialize) } ASSERT_EQ (rai::send_block::size, bytes.size ()); rai::bufferstream stream2 (bytes.data (), bytes.size ()); - bool error; + bool error (false); rai::send_block block2 (error, stream2); ASSERT_FALSE (error); ASSERT_EQ (block1, block2); @@ -227,7 +227,7 @@ TEST (receive_block, deserialize) } ASSERT_EQ (rai::receive_block::size, bytes.size ()); rai::bufferstream stream2 (bytes.data (), bytes.size ()); - bool error; + bool error (false); rai::receive_block block2 (error, stream2); ASSERT_FALSE (error); ASSERT_EQ (block1, block2); @@ -244,7 +244,7 @@ TEST (open_block, deserialize) } ASSERT_EQ (rai::open_block::size, bytes.size ()); rai::bufferstream stream (bytes.data (), bytes.size ()); - bool error; + bool error (false); rai::open_block block2 (error, stream); ASSERT_FALSE (error); ASSERT_EQ (block1, block2); @@ -265,7 +265,7 @@ TEST (change_block, deserialize) ASSERT_NE (nullptr, data); ASSERT_NE (0, size); rai::bufferstream stream2 (data, size); - bool error; + bool error (false); rai::change_block block2 (error, stream2); ASSERT_FALSE (error); ASSERT_EQ (block1, block2); @@ -349,7 +349,7 @@ TEST (state_block, serialization) } ASSERT_EQ (0x5, bytes[215]); // Ensure work is serialized big-endian ASSERT_EQ (rai::state_block::size, bytes.size ()); - bool error1; + bool error1 (false); rai::bufferstream stream (bytes.data (), bytes.size ()); rai::state_block block2 (error1, stream); ASSERT_FALSE (error1); @@ -369,7 +369,7 @@ TEST (state_block, serialization) std::stringstream body (json); boost::property_tree::ptree tree; boost::property_tree::read_json (body, tree); - bool error2; + bool error2 (false); rai::state_block block3 (error2, tree); ASSERT_FALSE (error2); ASSERT_EQ (block1, block3); diff --git a/rai/lib/blocks.cpp b/rai/lib/blocks.cpp index e44cfa66..66c05085 100644 --- a/rai/lib/blocks.cpp +++ b/rai/lib/blocks.cpp @@ -1133,7 +1133,7 @@ std::unique_ptr rai::deserialize_block_json (boost::property_tree::p auto type (tree_a.get ("type")); if (type == "receive") { - bool error; + bool error (false); std::unique_ptr obj (new rai::receive_block (error, tree_a)); if (!error) { @@ -1142,7 +1142,7 @@ std::unique_ptr rai::deserialize_block_json (boost::property_tree::p } else if (type == "send") { - bool error; + bool error (false); std::unique_ptr obj (new rai::send_block (error, tree_a)); if (!error) { @@ -1151,7 +1151,7 @@ std::unique_ptr rai::deserialize_block_json (boost::property_tree::p } else if (type == "open") { - bool error; + bool error (false); std::unique_ptr obj (new rai::open_block (error, tree_a)); if (!error) { @@ -1160,7 +1160,7 @@ std::unique_ptr rai::deserialize_block_json (boost::property_tree::p } else if (type == "change") { - bool error; + bool error (false); std::unique_ptr obj (new rai::change_block (error, tree_a)); if (!error) { @@ -1169,7 +1169,7 @@ std::unique_ptr rai::deserialize_block_json (boost::property_tree::p } else if (type == "state") { - bool error; + bool error (false); std::unique_ptr obj (new rai::state_block (error, tree_a)); if (!error) { @@ -1202,7 +1202,7 @@ std::unique_ptr rai::deserialize_block (rai::stream & stream_a, rai: { case rai::block_type::receive: { - bool error; + bool error (false); std::unique_ptr obj (new rai::receive_block (error, stream_a)); if (!error) { @@ -1212,7 +1212,7 @@ std::unique_ptr rai::deserialize_block (rai::stream & stream_a, rai: } case rai::block_type::send: { - bool error; + bool error (false); std::unique_ptr obj (new rai::send_block (error, stream_a)); if (!error) { @@ -1222,7 +1222,7 @@ std::unique_ptr rai::deserialize_block (rai::stream & stream_a, rai: } case rai::block_type::open: { - bool error; + bool error (false); std::unique_ptr obj (new rai::open_block (error, stream_a)); if (!error) { @@ -1232,7 +1232,7 @@ std::unique_ptr rai::deserialize_block (rai::stream & stream_a, rai: } case rai::block_type::change: { - bool error; + bool error (false); std::unique_ptr obj (new rai::change_block (error, stream_a)); if (!error) { @@ -1242,7 +1242,7 @@ std::unique_ptr rai::deserialize_block (rai::stream & stream_a, rai: } case rai::block_type::state: { - bool error; + bool error (false); std::unique_ptr obj (new rai::state_block (error, stream_a)); if (!error) { diff --git a/rai/node/bootstrap.cpp b/rai/node/bootstrap.cpp index 8dc2569d..caead313 100644 --- a/rai/node/bootstrap.cpp +++ b/rai/node/bootstrap.cpp @@ -1787,9 +1787,8 @@ void rai::bulk_pull_blocks_server::send_next () std::unique_ptr rai::bulk_pull_blocks_server::get_next () { std::unique_ptr result; - bool out_of_bounds; + bool out_of_bounds (false); - out_of_bounds = false; if (request->max_count != 0) { if (sent_count >= request->max_count) diff --git a/rai/node/common.cpp b/rai/node/common.cpp index 3b269c50..03fafbac 100644 --- a/rai/node/common.cpp +++ b/rai/node/common.cpp @@ -218,7 +218,7 @@ void rai::message_parser::deserialize_confirm_ack (rai::stream & stream_a, rai:: void rai::message_parser::deserialize_node_id_handshake (rai::stream & stream_a, rai::message_header const & header_a) { - bool error_l; + bool error_l (false); rai::node_id_handshake incoming (error_l, stream_a, header_a); if (!error_l && at_end (stream_a)) { diff --git a/rai/node/rpc.cpp b/rai/node/rpc.cpp index a3306e4f..de72cd64 100644 --- a/rai/node/rpc.cpp +++ b/rai/node/rpc.cpp @@ -4540,7 +4540,6 @@ void rai::rpc_connection::read () auto version (this_l->request.version ()); std::string request_id (boost::str (boost::format ("%1%") % boost::io::group (std::hex, std::showbase, reinterpret_cast (this_l.get ())))); auto response_handler ([this_l, version, start, request_id](boost::property_tree::ptree const & tree_a) { - std::stringstream ostream; boost::property_tree::write_json (ostream, tree_a); ostream.flush (); diff --git a/rai/node/rpc_secure.cpp b/rai/node/rpc_secure.cpp index e5389e3e..b19d0d3b 100644 --- a/rai/node/rpc_secure.cpp +++ b/rai/node/rpc_secure.cpp @@ -160,14 +160,12 @@ void rai::rpc_connection_secure::read () auto body (ostream.str ()); this_l->write_result (body, version); boost::beast::http::async_write (this_l->stream, this_l->res, [this_l](boost::system::error_code const & ec, size_t bytes_transferred) { - // Perform the SSL shutdown this_l->stream.async_shutdown ( std::bind ( &rai::rpc_connection_secure::on_shutdown, this_l, std::placeholders::_1)); - }); if (this_l->node->config.logging.log_rpc ()) diff --git a/rai/qt_test/qt.cpp b/rai/qt_test/qt.cpp index bc2a822e..ebe9f7f6 100644 --- a/rai/qt_test/qt.cpp +++ b/rai/qt_test/qt.cpp @@ -371,7 +371,7 @@ TEST (wallet, create_send) boost::property_tree::ptree tree1; std::stringstream istream (json); boost::property_tree::read_json (istream, tree1); - bool error; + bool error (false); rai::state_block send (error, tree1); ASSERT_FALSE (error); ASSERT_EQ (rai::process_result::progress, system.nodes[0]->process (send).code); @@ -405,7 +405,7 @@ TEST (wallet, create_open_receive) boost::property_tree::ptree tree1; std::stringstream istream1 (json1); boost::property_tree::read_json (istream1, tree1); - bool error; + bool error (false); rai::state_block open (error, tree1); ASSERT_FALSE (error); ASSERT_EQ (rai::process_result::progress, system.nodes[0]->process (open).code); @@ -420,7 +420,7 @@ TEST (wallet, create_open_receive) boost::property_tree::ptree tree2; std::stringstream istream2 (json2); boost::property_tree::read_json (istream2, tree2); - bool error2; + bool error2 (false); rai::state_block receive (error2, tree2); ASSERT_FALSE (error2); ASSERT_EQ (rai::process_result::progress, system.nodes[0]->process (receive).code); @@ -457,7 +457,7 @@ TEST (wallet, create_change) TEST (history, short_text) { - bool init; + bool init (false); rai_qt::eventloop_processor processor; rai::keypair key; rai::system system (24000, 1);