From 0dd25284c30dfdbfeff9a882dd801be8cacd0859 Mon Sep 17 00:00:00 2001 From: svost Date: Wed, 14 Oct 2015 22:52:22 +0300 Subject: [PATCH] Small code fixes: -usless cast (ptime) -hashBlock pass by reference -%u for unsigned int -fRet: simplified assignment --- src/init.cpp | 3 +-- src/rpcblockchain.cpp | 2 +- src/rpcrawtransaction.cpp | 2 +- src/rpcwallet.cpp | 2 +- src/util.h | 2 +- src/wallet.cpp | 4 ++-- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index dd34f91..66ad72d 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -190,12 +190,11 @@ bool AppInit(int argc, char* argv[]) extern void noui_connect(); int main(int argc, char* argv[]) { - bool fRet = false; // Connect bitcoind signal handlers noui_connect(); - fRet = AppInit(argc, argv); + bool fRet = AppInit(argc, argv); if (fRet && fDaemon) return 0; diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 05bcbff..054dca2 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -13,7 +13,7 @@ using namespace json_spirit; using namespace std; -extern void TxToJSON(const CTransaction& tx, const uint256 hashBlock, json_spirit::Object& entry); +extern void TxToJSON(const CTransaction& tx, const uint256& hashBlock, json_spirit::Object& entry); extern enum Checkpoints::CPMode CheckpointsMode; double GetDifficulty(const CBlockIndex* blockindex) diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index bd9880c..4fa6f67 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -44,7 +44,7 @@ void ScriptPubKeyToJSON(const CScript& scriptPubKey, Object& out, bool fIncludeH out.push_back(Pair("addresses", a)); } -void TxToJSON(const CTransaction& tx, const uint256 hashBlock, Object& entry) +void TxToJSON(const CTransaction& tx, const uint256& hashBlock, Object& entry) { entry.push_back(Pair("txid", tx.GetHash().GetHex())); entry.push_back(Pair("version", tx.nVersion)); diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index e4e352b..260cc57 100644 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -18,7 +18,7 @@ int64_t nWalletUnlockTime; static CCriticalSection cs_nWalletUnlockTime; extern int64_t nReserveBalance; -extern void TxToJSON(const CTransaction& tx, const uint256 hashBlock, json_spirit::Object& entry); +extern void TxToJSON(const CTransaction& tx, const uint256& hashBlock, json_spirit::Object& entry); std::string HelpRequiringPassphrase() { diff --git a/src/util.h b/src/util.h index e7f5977..3ef7331 100644 --- a/src/util.h +++ b/src/util.h @@ -370,7 +370,7 @@ inline int64_t GetPerformanceCounter() inline int64_t GetTimeMillis() { - return (boost::posix_time::ptime(boost::posix_time::microsec_clock::universal_time()) - + return (boost::posix_time::microsec_clock::universal_time() - boost::posix_time::ptime(boost::gregorian::date(1970,1,1))).total_milliseconds(); } diff --git a/src/wallet.cpp b/src/wallet.cpp index e02f30b..5595052 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -2544,7 +2544,7 @@ void CWallet::FixSpentCoins(int& nMismatchFound, int64_t& nBalanceInQuestion, bo { if (IsMine(pcoin->vout[n]) && pcoin->IsSpent(n) && (txindex.vSpent.size() <= n || txindex.vSpent[n].IsNull())) { - printf("FixSpentCoins found lost coin %sppc %s[%d], %s\n", + printf("FixSpentCoins found lost coin %sppc %s[%u], %s\n", FormatMoney(pcoin->vout[n].nValue).c_str(), pcoin->GetHash().ToString().c_str(), n, fCheckOnly? "repair not attempted" : "repairing"); nMismatchFound++; nBalanceInQuestion += pcoin->vout[n].nValue; @@ -2556,7 +2556,7 @@ void CWallet::FixSpentCoins(int& nMismatchFound, int64_t& nBalanceInQuestion, bo } else if (IsMine(pcoin->vout[n]) && !pcoin->IsSpent(n) && (txindex.vSpent.size() > n && !txindex.vSpent[n].IsNull())) { - printf("FixSpentCoins found spent coin %sppc %s[%d], %s\n", + printf("FixSpentCoins found spent coin %sppc %s[%u], %s\n", FormatMoney(pcoin->vout[n].nValue).c_str(), pcoin->GetHash().ToString().c_str(), n, fCheckOnly? "repair not attempted" : "repairing"); nMismatchFound++; nBalanceInQuestion += pcoin->vout[n].nValue; -- 1.7.1