From 4f6cd20b0dcafd30e3b5bc9e61278b83dd411102 Mon Sep 17 00:00:00 2001 From: Fuzzbawls Date: Tue, 14 May 2019 00:47:13 -0700 Subject: [PATCH] Cleanup clang's range loop analysis warnings --- src/kernel.cpp | 2 +- src/masternode-budget.cpp | 2 +- src/obfuscation.cpp | 26 +++++++++++++------------- src/rpc/net.cpp | 2 +- src/swifttx.cpp | 6 +++--- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/kernel.cpp b/src/kernel.cpp index 3773ffaf2609a..77269e0176c08 100644 --- a/src/kernel.cpp +++ b/src/kernel.cpp @@ -225,7 +225,7 @@ bool ComputeNextStakeModifier(const CBlockIndex* pindexPrev, uint64_t& nStakeMod strSelectionMap.replace(pindex->nHeight - nHeightFirstCandidate, 1, "="); pindex = pindex->pprev; } - for (const PAIRTYPE(uint256, const CBlockIndex*) & item : mapSelectedBlocks) { + for (const std::pair &item : mapSelectedBlocks) { // 'S' indicates selected proof-of-stake blocks // 'W' indicates selected proof-of-work blocks strSelectionMap.replace(item.second->nHeight - nHeightFirstCandidate, 1, item.second->IsProofOfStake() ? "S" : "W"); diff --git a/src/masternode-budget.cpp b/src/masternode-budget.cpp index 77b0f73d1f833..497f838263c87 100644 --- a/src/masternode-budget.cpp +++ b/src/masternode-budget.cpp @@ -42,7 +42,7 @@ bool IsBudgetCollateralValid(uint256 nTxCollateralHash, uint256 nExpectedHash, s findScript << OP_RETURN << ToByteVector(nExpectedHash); bool foundOpReturn = false; - for (const CTxOut o : txCollateral.vout) { + for (const CTxOut &o : txCollateral.vout) { if (!o.scriptPubKey.IsNormalPaymentScript() && !o.scriptPubKey.IsUnspendable()) { strError = strprintf("Invalid Script %s", txCollateral.ToString()); LogPrint("mnbudget","CBudgetProposalBroadcast::IsBudgetCollateralValid - %s\n", strError); diff --git a/src/obfuscation.cpp b/src/obfuscation.cpp index 2543531d0ca75..5ad7168a4ee08 100644 --- a/src/obfuscation.cpp +++ b/src/obfuscation.cpp @@ -203,7 +203,7 @@ void CObfuscationPool::ProcessMessageObfuscation(CNode* pfrom, std::string& strC CValidationState state; CMutableTransaction tx; - for (const CTxOut o : out) { + for (const CTxOut &o : out) { nValueOut += o.nValue; tx.vout.push_back(o); @@ -221,7 +221,7 @@ void CObfuscationPool::ProcessMessageObfuscation(CNode* pfrom, std::string& strC } } - for (const CTxIn i : in) { + for (const CTxIn &i : in) { tx.vin.push_back(i); LogPrint("obfuscation", "dsi -- tx in %s\n", i.ToString()); @@ -317,7 +317,7 @@ void CObfuscationPool::ProcessMessageObfuscation(CNode* pfrom, std::string& strC bool success = false; int count = 0; - for (const CTxIn item : sigs) { + for (const CTxIn &item : sigs) { if (AddScriptSig(item)) success = true; LogPrint("obfuscation", " -- sigs count %d %d\n", (int)sigs.size(), count); count++; @@ -692,8 +692,8 @@ void CObfuscationPool::ChargeFees() if (state == POOL_STATUS_SIGNING) { // who didn't sign? - for (const CObfuScationEntry v : entries) { - for (const CTxDSIn s : v.sev) { + for (const CObfuScationEntry &v : entries) { + for (const CTxDSIn &s : v.sev) { if (!s.fHasSig) { LogPrintf("CObfuscationPool::ChargeFees -- found uncooperative node (didn't sign). Found offence\n"); offences++; @@ -745,8 +745,8 @@ void CObfuscationPool::ChargeFees() if (state == POOL_STATUS_SIGNING) { // who didn't sign? - for (const CObfuScationEntry v : entries) { - for (const CTxDSIn s : v.sev) { + for (const CObfuScationEntry &v : entries) { + for (const CTxDSIn &s : v.sev) { if (!s.fHasSig && r > target) { LogPrintf("CObfuscationPool::ChargeFees -- found uncooperative node (didn't sign). charging fees.\n"); @@ -960,7 +960,7 @@ bool CObfuscationPool::IsCollateralValid(const CTransaction& txCollateral) int64_t nValueOut = 0; bool missingTx = false; - for (const CTxOut o : txCollateral.vout) { + for (const CTxOut &o : txCollateral.vout) { nValueOut += o.nValue; if (!o.scriptPubKey.IsNormalPaymentScript()) { @@ -969,7 +969,7 @@ bool CObfuscationPool::IsCollateralValid(const CTransaction& txCollateral) } } - for (const CTxIn i : txCollateral.vin) { + for (const CTxIn &i : txCollateral.vin) { CTransaction tx2; uint256 hash; if (GetTransaction(i.prevout.hash, tx2, hash, true)) { @@ -1268,8 +1268,8 @@ bool CObfuscationPool::SignFinalTransaction(CTransaction& finalTransactionNew, C vector sigs; //make sure my inputs/outputs are present, otherwise refuse to sign - for (const CObfuScationEntry e : entries) { - for (const CTxDSIn s : e.sev) { + for (const CObfuScationEntry &e : entries) { + for (const CTxDSIn &s : e.sev) { /* Sign my transaction and all outputs */ int mine = -1; CScript prevPubKey = CScript(); @@ -1297,7 +1297,7 @@ bool CObfuscationPool::SignFinalTransaction(CTransaction& finalTransactionNew, C } } - for (const CTxOut o : e.vout) + for (const CTxOut &o : e.vout) nValue2 += o.nValue; int targetOuputs = e.vout.size(); @@ -1844,7 +1844,7 @@ bool CObfuscationPool::IsCompatibleWithEntries(std::vector& vout) { if (GetDenominations(vout) == 0) return false; - for (const CObfuScationEntry v : entries) { + for (const CObfuScationEntry &v : entries) { LogPrintf(" IsCompatibleWithEntries %d %d\n", GetDenominations(vout), GetDenominations(v.vout)); /* for (CTxOut o1 : vout) diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp index f38d921200e0d..480b90b4a1b97 100644 --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -438,7 +438,7 @@ UniValue getnetworkinfo(const UniValue& params, bool fHelp) UniValue localAddresses(UniValue::VARR); { LOCK(cs_mapLocalHost); - for (const PAIRTYPE(CNetAddr, LocalServiceInfo) & item : mapLocalHost) { + for (const std::pair &item : mapLocalHost) { UniValue rec(UniValue::VOBJ); rec.push_back(Pair("address", item.first.ToString())); rec.push_back(Pair("port", item.second.nPort)); diff --git a/src/swifttx.cpp b/src/swifttx.cpp index b9e5399e93a31..6aaa974c0663f 100644 --- a/src/swifttx.cpp +++ b/src/swifttx.cpp @@ -60,7 +60,7 @@ void ProcessMessageSwiftTX(CNode* pfrom, std::string& strCommand, CDataStream& v return; } - for (const CTxOut o : tx.vout) { + for (const CTxOut &o : tx.vout) { // IX supports normal scripts and unspendable scripts (used in DS collateral and Budget collateral). // TODO: Look into other script types that are normal and can be included if (!o.scriptPubKey.IsNormalPaymentScript() && !o.scriptPubKey.IsUnspendable()) { @@ -184,10 +184,10 @@ bool IsIXTXValid(const CTransaction& txCollateral) CAmount nValueOut = 0; bool missingTx = false; - for (const CTxOut o : txCollateral.vout) + for (const CTxOut &o : txCollateral.vout) nValueOut += o.nValue; - for (const CTxIn i : txCollateral.vin) { + for (const CTxIn &i : txCollateral.vin) { CTransaction tx2; uint256 hash; if (GetTransaction(i.prevout.hash, tx2, hash, true)) {