Fix small typos in comments and error messages

Rebased-From: 67b2d819cdf6181e7f016e5366ce7479830893bd
Github-Pull: #5404

diff --git a/src/chain.h b/src/chain.h
index a8a6b4dd64736b5d3b19cf618530b28d1b0860a2..98db98987968474f4d710721d8e22f378cfc46a1 100644 (file)
--- a/src/chain.h
+++ b/src/chain.h
@@ -95,7 +95,7 @@ enum BlockStatus {
 class CBlockIndex
 {
 public:
-    //! pointer to the hash of the block, if any. memory is owned by this CBlockIndex
+    //! pointer to the hash of the block, if any. Memory is owned by this CBlockIndex
     const uint256* phashBlock;
 
     //! pointer to the index of the predecessor of this block

diff --git a/src/main.cpp b/src/main.cpp
index 7533c32614bd3b01c738f0f60d37b7779aabb4de..4160e4b788dc6ffac44f9909eb52c5977dbc9516 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1025,7 +1025,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
                                       hash.ToString(), nFees, txMinFee),
                              REJECT_INSUFFICIENTFEE, "insufficient fee");
 
-        // Continuously rate-limit free (really, very-low-fee)transactions
+        // Continuously rate-limit free (really, very-low-fee) transactions
         // This mitigates 'penny-flooding' -- sending thousands of free transactions just to
         // be annoying or make others' transactions take longer to confirm.
         if (fLimitFree && nFees < ::minRelayTxFee.GetFee(nSize))
@@ -1050,7 +1050,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
         }
 
         if (fRejectInsaneFee && nFees > ::minRelayTxFee.GetFee(nSize) * 10000)
-            return error("AcceptToMemoryPool: : insane fees %s, %d > %d",
+            return error("AcceptToMemoryPool: insane fees %s, %d > %d",
                          hash.ToString(),
                          nFees, ::minRelayTxFee.GetFee(nSize) * 10000);
 
@@ -1058,7 +1058,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
         // This is done last to help prevent CPU exhaustion denial-of-service attacks.
         if (!CheckInputs(tx, state, view, true, STANDARD_SCRIPT_VERIFY_FLAGS, true))
         {
-            return error("AcceptToMemoryPool: : ConnectInputs failed %s", hash.ToString());
+            return error("AcceptToMemoryPool: ConnectInputs failed %s", hash.ToString());
         }
         // Store transaction in memory
         pool.addUnchecked(hash, entry);
@@ -2988,7 +2988,7 @@ bool InitBlockIndex() {
                 return error("LoadBlockIndex() : genesis block not accepted");
             if (!ActivateBestChain(state, &block))
                 return error("LoadBlockIndex() : genesis block cannot be activated");
-            // Force a chainstate write so that when we VerifyDB in a moment, it doesnt check stale data
+            // Force a chainstate write so that when we VerifyDB in a moment, it doesn't check stale data
             return FlushStateToDisk(state, FLUSH_STATE_ALWAYS);
         } catch(std::runtime_error &e) {
             return error("LoadBlockIndex() : failed to initialize block database: %s", e.what());

diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 840eb536baa01157010dc88d10bcd78570cf0d2a..a9567d3b15791ed52ef9b875c28c6cf04e7101ca 100644 (file)
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -241,8 +241,8 @@ public:
             }
         }
 
-        //After new samples are added, we have to clear the sorted lists,
-        //so they'll be resorted the next time someone asks for an estimate
+        // After new samples are added, we have to clear the sorted lists,
+        // so they'll be resorted the next time someone asks for an estimate
         sortedFeeSamples.clear();
         sortedPrioritySamples.clear();
 

diff --git a/src/uint256.cpp b/src/uint256.cpp
index 79406f24757b5ae815c905f17fc9b44f3f5c9f9f..9ac886f815721f0cb975721316616196f6e24b82 100644 (file)
--- a/src/uint256.cpp
+++ b/src/uint256.cpp
@@ -99,7 +99,7 @@ base_uint<BITS>& base_uint<BITS>::operator/=(const base_uint& b)
     if (div_bits > num_bits) // the result is certainly 0.
         return *this;
     int shift = num_bits - div_bits;
-    div <<= shift; // shift so that div and nun align.
+    div <<= shift; // shift so that div and num align.
     while (shift >= 0) {
         if (num >= div) {
             num -= div;

diff --git a/src/wallet_ismine.cpp b/src/wallet_ismine.cpp
index 05dc40aaee579e1dbe34b90c9e6391d51414e636..839f694850f220a15116837f1e6089d721163f55 100644 (file)
--- a/src/wallet_ismine.cpp
+++ b/src/wallet_ismine.cpp
@@ -74,7 +74,7 @@ isminetype IsMine(const CKeyStore &keystore, const CScript& scriptPubKey)
     case TX_MULTISIG:
     {
         // Only consider transactions "mine" if we own ALL the
-        // keys involved. multi-signature transactions that are
+        // keys involved. Multi-signature transactions that are
         // partially owned (somebody else has a key that can spend
         // them) enable spend-out-from-under-you attacks, especially
         // in shared-wallet situations.