diff --git a/src/addrdb.cpp b/src/addrdb.cpp --- a/src/addrdb.cpp +++ b/src/addrdb.cpp @@ -15,7 +15,7 @@ #include "tinyformat.h" #include "util.h" -CBanDB::CBanDB(const CChainParams &chainParams) : chainParams(chainParams) { +CBanDB::CBanDB(const CChainParams &chainParamsIn) : chainParams(chainParamsIn) { pathBanlist = GetDataDir() / "banlist.dat"; } @@ -108,7 +108,8 @@ return true; } -CAddrDB::CAddrDB(const CChainParams &chainParams) : chainParams(chainParams) { +CAddrDB::CAddrDB(const CChainParams &chainParamsIn) + : chainParams(chainParamsIn) { pathAddr = GetDataDir() / "peers.dat"; } diff --git a/src/chain.h b/src/chain.h --- a/src/chain.h +++ b/src/chain.h @@ -277,9 +277,9 @@ template inline void SerializationOp(Stream &s, Operation ser_action) { - int nVersion = s.GetVersion(); + int version = s.GetVersion(); if (!(s.GetType() & SER_GETHASH)) { - READWRITE(VARINT(nVersion)); + READWRITE(VARINT(version)); } READWRITE(VARINT(nHeight)); diff --git a/src/rpc/abc.cpp b/src/rpc/abc.cpp --- a/src/rpc/abc.cpp +++ b/src/rpc/abc.cpp @@ -82,8 +82,8 @@ }; // clang-format on -void RegisterABCRPCCommands(CRPCTable &tableRPC) { +void RegisterABCRPCCommands(CRPCTable &t) { for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++) { - tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]); + t.appendCommand(commands[vcidx].name, &commands[vcidx]); } } diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -223,8 +223,6 @@ jreq.strMethod = strMethod; try { - JSONRPCRequest jreq; - jreq.fHelp = true; if (setDone.insert(pcmd).second) { pcmd->call(config, jreq); } diff --git a/src/script/interpreter.h b/src/script/interpreter.h --- a/src/script/interpreter.h +++ b/src/script/interpreter.h @@ -81,8 +81,9 @@ public: MutableTransactionSignatureChecker(const CMutableTransaction *txToIn, - unsigned int nInIn, const Amount amount) - : TransactionSignatureChecker(&txTo, nInIn, amount), txTo(*txToIn) {} + unsigned int nInIn, + const Amount amountIn) + : TransactionSignatureChecker(&txTo, nInIn, amountIn), txTo(*txToIn) {} }; bool EvalScript(std::vector> &stack, const CScript &script, diff --git a/src/script/sigcache.h b/src/script/sigcache.h --- a/src/script/sigcache.h +++ b/src/script/sigcache.h @@ -45,10 +45,10 @@ public: CachingTransactionSignatureChecker(const CTransaction *txToIn, - unsigned int nInIn, const Amount amount, - bool storeIn, + unsigned int nInIn, + const Amount amountIn, bool storeIn, PrecomputedTransactionData &txdataIn) - : TransactionSignatureChecker(txToIn, nInIn, amount, txdataIn), + : TransactionSignatureChecker(txToIn, nInIn, amountIn, txdataIn), store(storeIn) {} bool VerifySignature(const std::vector &vchSig, diff --git a/src/script/sign.h b/src/script/sign.h --- a/src/script/sign.h +++ b/src/script/sign.h @@ -55,9 +55,10 @@ public: MutableTransactionSignatureCreator(const CKeyStore *keystoreIn, const CMutableTransaction *txToIn, - unsigned int nInIn, const Amount amount, + unsigned int nInIn, + const Amount amountIn, SigHashType sigHashTypeIn) - : TransactionSignatureCreator(keystoreIn, &tx, nInIn, amount, + : TransactionSignatureCreator(keystoreIn, &tx, nInIn, amountIn, sigHashTypeIn), tx(*txToIn) {} }; diff --git a/src/txmempool.cpp b/src/txmempool.cpp --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -1306,15 +1306,15 @@ for (const TxId &txid : worklist) { // If we do not have that txid in the set, nothing needs to be // done. - auto it = queuedTx.find(txid); - if (it == queuedTx.end()) { + auto pit = queuedTx.find(txid); + if (pit == queuedTx.end()) { continue; } // We have parent in our set, we reinsert them at the right // position. - const CTransactionRef ptx = *it; - queuedTx.erase(it); + const CTransactionRef ptx = *pit; + queuedTx.erase(pit); queuedTx.insert(ptx); // And we make sure ancestors are covered. diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -712,15 +712,15 @@ unsigned int nMasterKeyMaxID; // Create wallet with dummy database handle - CWallet(const CChainParams &chainParams) - : dbw(new CWalletDBWrapper()), chainParams(chainParams) { + CWallet(const CChainParams &chainParamsIn) + : dbw(new CWalletDBWrapper()), chainParams(chainParamsIn) { SetNull(); } // Create wallet with passed-in database handle - CWallet(const CChainParams &chainParams, + CWallet(const CChainParams &chainParamsIn, std::unique_ptr dbw_in) - : dbw(std::move(dbw_in)), chainParams(chainParams) { + : dbw(std::move(dbw_in)), chainParams(chainParamsIn) { SetNull(); }