Merge pull request #1640 from evoskuil/master

Fix inverted NOEXCEPT define (regression), style, comments, whitespace.

Author: evoskuil

include/bitcoin/system/chain/transaction.hpp

@@ -181,7 +181,7 @@ class BC_API transaction
     bool is_internal_double_spend() const NOEXCEPT;
     bool is_oversized() const NOEXCEPT;
 
-    /// Guard ((requires context).
+    /// Guard (requires context).
     /// -----------------------------------------------------------------------
 
     ////bool is_segregated() const NOEXCEPT;

include/bitcoin/system/preprocessor.hpp

@@ -61,11 +61,11 @@
 #endif
 
 #if defined(NDEBUG)
-    #define NOEXCEPT
-    #define THROWS
-#else
     #define NOEXCEPT noexcept
     #define THROWS noexcept(false)
+#else
+    #define NOEXCEPT
+    #define THROWS
 #endif
 
 /// Messages.

src/chain/script.cpp

@@ -47,6 +47,7 @@ namespace chain {
 using namespace bc::system::machine;
 
 BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
+BC_PUSH_WARNING(NO_ARRAY_INDEXING)
 
 // static
 // TODO: would be inlined but machine is a circular include.
@@ -58,11 +59,9 @@ BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
 //*************************************************************************
 bool script::is_coinbase_pattern(const operations& ops, size_t height) NOEXCEPT
 {
-    BC_PUSH_WARNING(NO_ARRAY_INDEXING)
     return !ops.empty()
         && ops[0].is_nominal_push()
         && ops[0].data() == number::chunk::from_integer(to_unsigned(height));
-    BC_POP_WARNING()
 }
 
 // Constructors.
@@ -403,10 +402,7 @@ size_t script::serialized_size(bool prefix) const NOEXCEPT
 const data_chunk& script::witness_program() const NOEXCEPT
 {
     static const data_chunk empty{};
-
-    BC_PUSH_WARNING(NO_ARRAY_INDEXING)
     return is_witness_program_pattern(ops()) ? ops()[1].data() : empty;
-    BC_POP_WARNING()
 }
 
 script_version script::version() const NOEXCEPT
@@ -548,6 +544,7 @@ bool script::is_unspendable() const NOEXCEPT
     return operation::is_reserved(code) || operation::is_invalid(code);
 }
 
+BC_POP_WARNING()
 BC_POP_WARNING()
 
 // JSON value convertors.

src/chain/transaction.cpp

@@ -417,10 +417,7 @@ hash_digest transaction::hash(bool witness) const NOEXCEPT
         if (nominal_hash_) return *nominal_hash_;
     }
 
-    BC_PUSH_WARNING(LOCAL_VARIABLE_NOT_INITIALIZED)
-    hash_digest digest;
-    BC_POP_WARNING()
-
+    hash_digest digest{};
     stream::out::fast stream{ digest };
     hash::sha256x2::fast sink{ stream };
     to_data(sink, witness);
@@ -499,10 +496,7 @@ hash_digest transaction::outputs_hash() const NOEXCEPT
     if (sighash_cache_)
         return sighash_cache_->outputs;
 
-    BC_PUSH_WARNING(LOCAL_VARIABLE_NOT_INITIALIZED)
-    hash_digest digest;
-    BC_POP_WARNING()
-        
+    hash_digest digest{};
     stream::out::fast stream{ digest };
     hash::sha256x2::fast sink{ stream };
 
@@ -518,10 +512,7 @@ hash_digest transaction::points_hash() const NOEXCEPT
     if (sighash_cache_)
         return sighash_cache_->points;
 
-    BC_PUSH_WARNING(LOCAL_VARIABLE_NOT_INITIALIZED)
-    hash_digest digest;
-    BC_POP_WARNING()
-
+    hash_digest digest{};
     stream::out::fast stream{ digest };
     hash::sha256x2::fast sink{ stream };
 
@@ -537,10 +528,7 @@ hash_digest transaction::sequences_hash() const NOEXCEPT
     if (sighash_cache_)
         return sighash_cache_->sequences;
 
-    BC_PUSH_WARNING(LOCAL_VARIABLE_NOT_INITIALIZED)
-    hash_digest digest;
-    BC_POP_WARNING()
-
+    hash_digest digest{};
     stream::out::fast stream{ digest };
     hash::sha256x2::fast sink{ stream };
 
@@ -735,10 +723,7 @@ hash_digest transaction::unversioned_signature_hash(
     const auto flag = mask_sighash(sighash_flags);
 
     // Create hash writer.
-    BC_PUSH_WARNING(LOCAL_VARIABLE_NOT_INITIALIZED)
-    hash_digest digest;
-    BC_POP_WARNING()
-
+    hash_digest digest{};
     stream::out::fast stream{ digest };
     hash::sha256x2::fast sink{ stream };
 
@@ -804,10 +789,7 @@ hash_digest transaction::output_hash(const input_iterator& input) const NOEXCEPT
     if (index >= outputs_->size())
         return null_hash;
 
-    BC_PUSH_WARNING(LOCAL_VARIABLE_NOT_INITIALIZED)
-    hash_digest digest;
-    BC_POP_WARNING()
-
+    hash_digest digest{};
     stream::out::fast stream{ digest };
     hash::sha256x2::fast sink{ stream };
     outputs_->at(index)->to_data(sink);
@@ -831,10 +813,7 @@ hash_digest transaction::version_0_signature_hash(const input_iterator& input,
     const auto single = (flag == coverage::hash_single);
 
     // Create hash writer.
-    BC_PUSH_WARNING(LOCAL_VARIABLE_NOT_INITIALIZED)
-    hash_digest digest;
-    BC_POP_WARNING()
-
+    hash_digest digest{};
     stream::out::fast stream{ digest };
     hash::sha256x2::fast sink{ stream };
 
@@ -1237,7 +1216,7 @@ code transaction::guard_check(const context& ctx) const NOEXCEPT
 
      if (!bip141 && is_segregated())
         return error::unexpected_witness_transaction;
-    if (bip141 && is_overweight())
+     if (bip141 && is_overweight())
         return error::transaction_weight_limit;
 
     return error::transaction_success;