Do not shadow variables.

paveljanik · paveljanik · commit b175cb755bd2 · 2016-08-31T16:16:05.000+02:00
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
@@ -387,11 +387,11 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip)
                         while (fSuccess) {
                             CDataStream ssKey(SER_DISK, CLIENT_VERSION);
                             CDataStream ssValue(SER_DISK, CLIENT_VERSION);
-                            int ret = db.ReadAtCursor(pcursor, ssKey, ssValue);
-                            if (ret == DB_NOTFOUND) {
+                            int ret1 = db.ReadAtCursor(pcursor, ssKey, ssValue);
+                            if (ret1 == DB_NOTFOUND) {
                                 pcursor->close();
                                 break;
-                            } else if (ret != 0) {
+                            } else if (ret1 != 0) {
                                 pcursor->close();
                                 fSuccess = false;
                                 break;
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
@@ -1176,10 +1176,10 @@ UniValue ListReceived(const UniValue& params, bool fByAccounts)
 
         if (fByAccounts)
         {
-            tallyitem& item = mapAccountTally[strAccount];
-            item.nAmount += nAmount;
-            item.nConf = min(item.nConf, nConf);
-            item.fIsWatchonly = fIsWatchonly;
+            tallyitem& _item = mapAccountTally[strAccount];
+            _item.nAmount += nAmount;
+            _item.nConf = min(_item.nConf, nConf);
+            _item.fIsWatchonly = fIsWatchonly;
         }
         else
         {
@@ -1195,9 +1195,9 @@ UniValue ListReceived(const UniValue& params, bool fByAccounts)
             UniValue transactions(UniValue::VARR);
             if (it != mapTally.end())
             {
-                BOOST_FOREACH(const uint256& item, (*it).second.txids)
+                BOOST_FOREACH(const uint256& _item, (*it).second.txids)
                 {
-                    transactions.push_back(item.GetHex());
+                    transactions.push_back(_item.GetHex());
                 }
             }
             obj.push_back(Pair("txids", transactions));
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
@@ -217,7 +217,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
         // run the 'mtgox' test (see http://blockexplorer.com/tx/29a3efd3ef04f9153d47a990bd7b048a4b2d213daaa5fb8ed670fb85f13bdbcf)
         // they tried to consolidate 10 50k coins into one 500k coin, and ended up with 50k in change
         empty_wallet();
-        for (int i = 0; i < 20; i++)
+        for (int j = 0; j < 20; j++)
             add_coin(50000 * COIN);
 
         BOOST_CHECK( wallet.SelectCoinsMinConf(500000 * COIN, 1, 1, vCoins, setCoinsRet, nValueRet));
@@ -296,7 +296,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
             BOOST_CHECK(!equal_sets(setCoinsRet, setCoinsRet2));
 
             int fails = 0;
-            for (int i = 0; i < RANDOM_REPEATS; i++)
+            for (int j = 0; j < RANDOM_REPEATS; j++)
             {
                 // selecting 1 from 100 identical coins depends on the shuffle; this test will fail 1% of the time
                 // run the test RANDOM_REPEATS times and only complain if all of them fail
@@ -317,7 +317,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
             add_coin(25 * CENT);
 
             fails = 0;
-            for (int i = 0; i < RANDOM_REPEATS; i++)
+            for (int j = 0; j < RANDOM_REPEATS; j++)
             {
                 // selecting 1 from 100 identical coins depends on the shuffle; this test will fail 1% of the time
                 // run the test RANDOM_REPEATS times and only complain if all of them fail
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
@@ -887,8 +887,8 @@ void ThreadFlushWalletDB(const string& strFile)
                 if (nRefCount == 0)
                 {
                     boost::this_thread::interruption_point();
-                    map<string, int>::iterator mi = bitdb.mapFileUseCount.find(strFile);
-                    if (mi != bitdb.mapFileUseCount.end())
+                    map<string, int>::iterator _mi = bitdb.mapFileUseCount.find(strFile);
+                    if (_mi != bitdb.mapFileUseCount.end())
                     {
                         LogPrint("db", "Flushing %s\n", strFile);
                         nLastFlushed = nWalletDBUpdated;
@@ -898,7 +898,7 @@ void ThreadFlushWalletDB(const string& strFile)
                         bitdb.CloseDb(strFile);
                         bitdb.CheckpointLSN(strFile);
 
-                        bitdb.mapFileUseCount.erase(mi++);
+                        bitdb.mapFileUseCount.erase(_mi++);
                         LogPrint("db", "Flushed %s %dms\n", strFile, GetTimeMillis() - nStart);
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -1176,10 +1176,10 @@ UniValue ListReceived(const UniValue& params, bool fByAccounts)`
`1176`	`1176`
`1177`	`1177`	`if (fByAccounts)`
`1178`	`1178`	`{`
`1179`		`- tallyitem& item = mapAccountTally[strAccount];`
`1180`		`- item.nAmount += nAmount;`
`1181`		`- item.nConf = min(item.nConf, nConf);`
`1182`		`- item.fIsWatchonly = fIsWatchonly;`
	`1179`	`+ tallyitem& _item = mapAccountTally[strAccount];`
	`1180`	`+ _item.nAmount += nAmount;`
	`1181`	`+ _item.nConf = min(_item.nConf, nConf);`
	`1182`	`+ _item.fIsWatchonly = fIsWatchonly;`
`1183`	`1183`	`}`
`1184`	`1184`	`else`
`1185`	`1185`	`{`
`@@ -1195,9 +1195,9 @@ UniValue ListReceived(const UniValue& params, bool fByAccounts)`
`1195`	`1195`	`UniValue transactions(UniValue::VARR);`
`1196`	`1196`	`if (it != mapTally.end())`
`1197`	`1197`	`{`
`1198`		`- BOOST_FOREACH(const uint256& item, (*it).second.txids)`
	`1198`	`+ BOOST_FOREACH(const uint256& _item, (*it).second.txids)`
`1199`	`1199`	`{`
`1200`		`- transactions.push_back(item.GetHex());`
	`1200`	`+ transactions.push_back(_item.GetHex());`
`1201`	`1201`	`}`
`1202`	`1202`	`}`
`1203`	`1203`	`obj.push_back(Pair("txids", transactions));`
Original file line number	Diff line number	Diff line change
`@@ -887,8 +887,8 @@ void ThreadFlushWalletDB(const string& strFile)`
`887`	`887`	`if (nRefCount == 0)`
`888`	`888`	`{`
`889`	`889`	`boost::this_thread::interruption_point();`
`890`		`- map<string, int>::iterator mi = bitdb.mapFileUseCount.find(strFile);`
`891`		`- if (mi != bitdb.mapFileUseCount.end())`
	`890`	`+ map<string, int>::iterator _mi = bitdb.mapFileUseCount.find(strFile);`
	`891`	`+ if (_mi != bitdb.mapFileUseCount.end())`
`892`	`892`	`{`
`893`	`893`	`LogPrint("db", "Flushing %s\n", strFile);`
`894`	`894`	`nLastFlushed = nWalletDBUpdated;`
`@@ -898,7 +898,7 @@ void ThreadFlushWalletDB(const string& strFile)`
`898`	`898`	`bitdb.CloseDb(strFile);`
`899`	`899`	`bitdb.CheckpointLSN(strFile);`
`900`	`900`
`901`		`- bitdb.mapFileUseCount.erase(mi++);`
	`901`	`+ bitdb.mapFileUseCount.erase(_mi++);`
`902`	`902`	`LogPrint("db", "Flushed %s %dms\n", strFile, GetTimeMillis() - nStart);`
`903`	`903`	`}`
`904`	`904`	`}`