diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-07-20 16:55:31 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-07-20 16:56:45 +0200 |
| commit | fd2814ef1182834d4471223adfc36ec10d28d908 (patch) | |
| tree | aab74ca8d4ebefa18beeaca64053b2887c64bc80 | |
| parent | adf170daf90f2f3221bccf69c6cf201bd9a0e3ae (diff) | |
| parent | 5a6671c4ca85947b59d03a4f9f0f24412a8f9cf7 (diff) | |
| download | bitcoin-fd2814ef1182834d4471223adfc36ec10d28d908.tar.xz | |
Merge #10862: Remove unused variable int64_t nEnd. Fix typo: "conditon" → "condition".
5a6671c Fix typo: "conditon" → "condition" (practicalswift)
35aff43 Remove unused variable int64_t nEnd (practicalswift)
Pull request description:
* Remove unused variable `int64_t nEnd`. Last use of `nEnd` removed in commit 1fc8c3d.
* Fix typo: "conditon" → "condition". Typo introduced in commit 439c4e8.
Tree-SHA512: 61624e6f70828c485fe46dbe00df76f1a07b7a5849d41bf7d279323b687420e60e9b85192f611a37211f17f3dea8eb3f6f6dc65d90c92e5516404fd81d37785a
| -rw-r--r-- | src/policy/fees.cpp | 6 | ||||
| -rw-r--r-- | src/wallet/wallet.cpp | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp index 73cc0b4a5e..b9476407cf 100644 --- a/src/policy/fees.cpp +++ b/src/policy/fees.cpp @@ -840,7 +840,7 @@ CFeeRate CBlockPolicyEstimator::estimateSmartFee(int confTarget, FeeCalculation // Return failure if trying to analyze a target we're not tracking if (confTarget <= 0 || (unsigned int)confTarget > longStats->GetMaxConfirms()) { - return CFeeRate(0); // error conditon + return CFeeRate(0); // error condition } // It's not possible to get reasonable estimates for confTarget of 1 @@ -852,7 +852,7 @@ CFeeRate CBlockPolicyEstimator::estimateSmartFee(int confTarget, FeeCalculation } if (feeCalc) feeCalc->returnedTarget = confTarget; - if (confTarget <= 1) return CFeeRate(0); // error conditon + if (confTarget <= 1) return CFeeRate(0); // error condition assert(confTarget > 0); //estimateCombinedFee and estimateConservativeFee take unsigned ints /** true is passed to estimateCombined fee for target/2 and target so @@ -899,7 +899,7 @@ CFeeRate CBlockPolicyEstimator::estimateSmartFee(int confTarget, FeeCalculation } } - if (median < 0) return CFeeRate(0); // error conditon + if (median < 0) return CFeeRate(0); // error condition return CFeeRate(median); } diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 7a0aac5f53..223790aa40 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3222,7 +3222,6 @@ bool CWallet::TopUpKeyPool(unsigned int kpSize) CWalletDB walletdb(*dbw); for (int64_t i = missingInternal + missingExternal; i--;) { - int64_t nEnd = 1; if (i < missingInternal) { internal = true; } |