diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2017-06-05 22:01:48 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2017-06-06 21:17:09 +0000 |
| commit | b823a4c9f6836c802803dbd265cb7451fb93b8e7 (patch) | |
| tree | cb2617a99de25ac9d2c685020949e7416e5b471b /src/wallet/walletdb.h | |
| parent | 84dcb45017a85e358fed274c49b342a40a1d1233 (diff) | |
| download | bitcoin-b823a4c9f6836c802803dbd265cb7451fb93b8e7.tar.xz | |
wallet: Include actual backup filename in recovery warning message
Diffstat (limited to 'src/wallet/walletdb.h')
| -rw-r--r-- | src/wallet/walletdb.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h index 64cebd4330..d78f143ebd 100644 --- a/src/wallet/walletdb.h +++ b/src/wallet/walletdb.h @@ -218,9 +218,9 @@ public: DBErrors ZapWalletTx(std::vector<CWalletTx>& vWtx); DBErrors ZapSelectTx(std::vector<uint256>& vHashIn, std::vector<uint256>& vHashOut); /* Try to (very carefully!) recover wallet database (with a possible key type filter) */ - static bool Recover(const std::string& filename, void *callbackDataIn, bool (*recoverKVcallback)(void* callbackData, CDataStream ssKey, CDataStream ssValue)); + static bool Recover(const std::string& filename, void *callbackDataIn, bool (*recoverKVcallback)(void* callbackData, CDataStream ssKey, CDataStream ssValue), std::string& out_backup_filename); /* Recover convenience-function to bypass the key filter callback, called when verify fails, recovers everything */ - static bool Recover(const std::string& filename); + static bool Recover(const std::string& filename, std::string& out_backup_filename); /* Recover filter (used as callback), will only let keys (cryptographical keys) as KV/key-type pass through */ static bool RecoverKeysOnlyFilter(void *callbackData, CDataStream ssKey, CDataStream ssValue); /* Function to determine if a certain KV/key-type is a key (cryptographical key) type */ |