Merge pull request #6137

laanwj · laanwj · commit 97ccfdca8a85 · 2015-05-16T09:37:01.000+02:00
a5baba5 minor: remove unneeded bool in CWalletDB::Recover (Philip Kaufmann)
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
@@ -915,15 +915,14 @@ bool CWalletDB::Recover(CDBEnv& dbenv, const std::string& filename, bool fOnlyKe
     }
 
     std::vector<CDBEnv::KeyValPair> salvagedData;
-    bool allOK = dbenv.Salvage(newFilename, true, salvagedData);
+    bool fSuccess = dbenv.Salvage(newFilename, true, salvagedData);
     if (salvagedData.empty())
     {
         LogPrintf("Salvage(aggressive) found no records in %s.\n", newFilename);
         return false;
     }
     LogPrintf("Salvage(aggressive) found %u records\n", salvagedData.size());
 
-    bool fSuccess = allOK;
     boost::scoped_ptr<Db> pdbCopy(new Db(dbenv.dbenv, 0));
     int ret = pdbCopy->open(NULL,               // Txn pointer
                             filename.c_str(),   // Filename

Original file line number	Diff line number	Diff line change
`@@ -915,15 +915,14 @@ bool CWalletDB::Recover(CDBEnv& dbenv, const std::string& filename, bool fOnlyKe`
`915`	`915`	`}`
`916`	`916`
`917`	`917`	`std::vector<CDBEnv::KeyValPair> salvagedData;`
`918`		`- bool allOK = dbenv.Salvage(newFilename, true, salvagedData);`
	`918`	`+ bool fSuccess = dbenv.Salvage(newFilename, true, salvagedData);`
`919`	`919`	`if (salvagedData.empty())`
`920`	`920`	`{`
`921`	`921`	`LogPrintf("Salvage(aggressive) found no records in %s.\n", newFilename);`
`922`	`922`	`return false;`
`923`	`923`	`}`
`924`	`924`	`LogPrintf("Salvage(aggressive) found %u records\n", salvagedData.size());`
`925`	`925`
`926`		`- bool fSuccess = allOK;`
`927`	`926`	`boost::scoped_ptr<Db> pdbCopy(new Db(dbenv.dbenv, 0));`
`928`	`927`	`int ret = pdbCopy->open(NULL, // Txn pointer`
`929`	`928`	`filename.c_str(), // Filename`