From a47da4b6fecaba81dafe777b25be24e04a428e37 Mon Sep 17 00:00:00 2001 From: practicalswift Date: Fri, 3 Feb 2017 09:20:54 +0100 Subject: [PATCH] Use z = std::max(x - y, 0); instead of z = x - y; if (z < 0) z = 0; --- src/addrman.cpp | 6 +----- src/qt/coincontroldialog.cpp | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/addrman.cpp b/src/addrman.cpp index f3c238fbb2c..b6ab4c63051 100644 --- a/src/addrman.cpp +++ b/src/addrman.cpp @@ -53,11 +53,7 @@ bool CAddrInfo::IsTerrible(int64_t nNow) const double CAddrInfo::GetChance(int64_t nNow) const { double fChance = 1.0; - - int64_t nSinceLastTry = nNow - nLastTry; - - if (nSinceLastTry < 0) - nSinceLastTry = 0; + int64_t nSinceLastTry = std::max(nNow - nLastTry, 0); // deprioritize very recent attempts away if (nSinceLastTry < 60 * 10) diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index f8aba70d92f..d4fd8bd3726 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -563,9 +563,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog) } // after fee - nAfterFee = nAmount - nPayFee; - if (nAfterFee < 0) - nAfterFee = 0; + nAfterFee = std::max(nAmount - nPayFee, 0); } // actually update labels