diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-05-16 09:21:57 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-05-16 09:37:01 +0200 |
| commit | 97ccfdca8a85b026bb88c20573e34955516185b2 (patch) | |
| tree | 2aa504b9b56ca4c62e45e1610c3a6a40d5249182 /src/wallet | |
| parent | 2a822987dd710427328fa458a4141e060c39a755 (diff) | |
| parent | a5baba52c58f4c17113d0eec445b3f5fa87a6acd (diff) | |
| download | bitcoin-97ccfdca8a85b026bb88c20573e34955516185b2.tar.xz | |
Merge pull request #6137
a5baba5 minor: remove unneeded bool in CWalletDB::Recover (Philip Kaufmann)
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/walletdb.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp index de56a2d1af..13eaf95aa6 100644 --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -915,7 +915,7 @@ 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); @@ -923,7 +923,6 @@ bool CWalletDB::Recover(CDBEnv& dbenv, const std::string& filename, bool fOnlyKe } 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 |