Browse Source
Merge pull request #6137
a5baba5 minor: remove unneeded bool in CWalletDB::Recover (Philip Kaufmann)
pull/145/head
Wladimir J. van der Laan
9 years ago
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
1 changed files with
1 additions and
2 deletions
-
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
|
|
|
|
|
