diff options
| author | Wladimir J. van der Laan <[email protected]> | 2015-03-09 12:43:21 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2015-03-09 12:51:07 +0100 |
| commit | cdae53e456ad35216e33a90f1681aade546cc431 (patch) | |
| tree | d21c3163a804c7542241c089075586acd16c218e /src/walletdb.cpp | |
| parent | Merge pull request #5442 (diff) | |
| parent | Reinitialize state in between individual unit tests. (diff) | |
| download | discoin-cdae53e456ad35216e33a90f1681aade546cc431.tar.xz discoin-cdae53e456ad35216e33a90f1681aade546cc431.zip | |
Merge pull request #5852
51598b2 Reinitialize state in between individual unit tests. (Pieter Wuille)
Diffstat (limited to 'src/walletdb.cpp')
| -rw-r--r-- | src/walletdb.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/walletdb.cpp b/src/walletdb.cpp index b2daf036f..ddec57d9a 100644 --- a/src/walletdb.cpp +++ b/src/walletdb.cpp @@ -903,8 +903,8 @@ bool CWalletDB::Recover(CDBEnv& dbenv, std::string filename, bool fOnlyKeys) int64_t now = GetTime(); std::string newFilename = strprintf("wallet.%d.bak", now); - int result = dbenv.dbenv.dbrename(NULL, filename.c_str(), NULL, - newFilename.c_str(), DB_AUTO_COMMIT); + int result = dbenv.dbenv->dbrename(NULL, filename.c_str(), NULL, + newFilename.c_str(), DB_AUTO_COMMIT); if (result == 0) LogPrintf("Renamed %s to %s\n", filename, newFilename); else @@ -923,7 +923,7 @@ bool CWalletDB::Recover(CDBEnv& dbenv, std::string filename, bool fOnlyKeys) 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 filename.c_str(), // Filename "main", // Logical db name |