Merge pull request #6137
a5baba5
minor: remove unneeded bool in CWalletDB::Recover (Philip Kaufmann)
This commit is contained in:
commit
97ccfdca8a
1 changed files with 1 additions and 2 deletions
|
@ -915,7 +915,7 @@ bool CWalletDB::Recover(CDBEnv& dbenv, const std::string& filename, bool fOnlyKe
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<CDBEnv::KeyValPair> salvagedData;
|
std::vector<CDBEnv::KeyValPair> salvagedData;
|
||||||
bool allOK = dbenv.Salvage(newFilename, true, salvagedData);
|
bool fSuccess = dbenv.Salvage(newFilename, true, salvagedData);
|
||||||
if (salvagedData.empty())
|
if (salvagedData.empty())
|
||||||
{
|
{
|
||||||
LogPrintf("Salvage(aggressive) found no records in %s.\n", newFilename);
|
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());
|
LogPrintf("Salvage(aggressive) found %u records\n", salvagedData.size());
|
||||||
|
|
||||||
bool fSuccess = allOK;
|
|
||||||
boost::scoped_ptr<Db> pdbCopy(new Db(dbenv.dbenv, 0));
|
boost::scoped_ptr<Db> pdbCopy(new Db(dbenv.dbenv, 0));
|
||||||
int ret = pdbCopy->open(NULL, // Txn pointer
|
int ret = pdbCopy->open(NULL, // Txn pointer
|
||||||
filename.c_str(), // Filename
|
filename.c_str(), // Filename
|
||||||
|
|
Loading…
Reference in a new issue