remove unused fNoncriticalErrors variable from CWalletDB::FindWalletTx

PierreRochard · PierreRochard · commit ecf9b25a03d8 · 2017-12-17T11:01:23.000-05:00
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
@@ -626,7 +626,6 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet)
 
 DBErrors CWalletDB::FindWalletTx(std::vector<uint256>& vTxHash, std::vector<CWalletTx>& vWtx)
 {
-    bool fNoncriticalErrors = false;
     DBErrors result = DB_LOAD_OK;
 
     try {
@@ -681,9 +680,6 @@ DBErrors CWalletDB::FindWalletTx(std::vector<uint256>& vTxHash, std::vector<CWal
         result = DB_CORRUPT;
     }
 
-    if (fNoncriticalErrors && result == DB_LOAD_OK)
-        result = DB_NONCRITICAL_ERROR;
-
     return result;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -626,7 +626,6 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet)`
`626`	`626`
`627`	`627`	`DBErrors CWalletDB::FindWalletTx(std::vector<uint256>& vTxHash, std::vector<CWalletTx>& vWtx)`
`628`	`628`	`{`
`629`		`- bool fNoncriticalErrors = false;`
`630`	`629`	`DBErrors result = DB_LOAD_OK;`
`631`	`630`
`632`	`631`	`try {`
`@@ -681,9 +680,6 @@ DBErrors CWalletDB::FindWalletTx(std::vector<uint256>& vTxHash, std::vector<CWal`
`681`	`680`	`result = DB_CORRUPT;`
`682`	`681`	`}`
`683`	`682`
`684`		`- if (fNoncriticalErrors && result == DB_LOAD_OK)`
`685`		`- result = DB_NONCRITICAL_ERROR;`
`686`		`-`
`687`	`683`	`return result;`
`688`	`684`	`}`
`689`	`685`