Merge pull request bitcoin#6137

a5baba5 minor: remove unneeded bool in CWalletDB::Recover (Philip Kaufmann)
pennyfx · May 16, 2015 · 97ccfdc · 97ccfdc
2 parents 2a82298 + a5baba5
commit 97ccfdc
Showing 1 changed file with 1 addition and 2 deletions.
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