RanchiMall/flocore-node
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drop warnings.

Browse Source
This commit is contained in:
Christopher Jeffrey 2014-08-12 18:14:44 -04:00
parent 1f8a12200d
commit 921c1f384f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
work.cpp
View File

@ -124,6 +124,7 @@ bool AppInit3(boost::thread_group& threadGroup) {
// try again // try again
if (!bitdb.Open(GetDataDir())) { if (!bitdb.Open(GetDataDir())) {
// if it still fails, it probably means we can't even create the database env // if it still fails, it probably means we can't even create the database env
string msg = strprintf(_("Error initializing wallet database environment %s!"), strDataDir);
return InitError(msg); return InitError(msg);
} }
} }
@ -131,11 +132,10 @@ bool AppInit3(boost::thread_group& threadGroup) {
if (filesystem::exists(GetDataDir() / strWalletFile)) { if (filesystem::exists(GetDataDir() / strWalletFile)) {
CDBEnv::VerifyResult r = bitdb.Verify(strWalletFile, CWalletDB::Recover); CDBEnv::VerifyResult r = bitdb.Verify(strWalletFile, CWalletDB::Recover);
if (r == CDBEnv::RECOVER_OK) { if (r == CDBEnv::RECOVER_OK) {
string msg = strprintf(_("Warning: wallet.dat corrupt, data salvaged!" // Warning: wallet.dat corrupt, data salvaged!
" Original wallet.dat saved as wallet.{timestamp}.bak in %s; if" // Original wallet.dat saved as wallet.{timestamp}.bak in data dir; if
" your balance or transactions are incorrect you should" // your balance or transactions are incorrect you should
" restore from a backup."), strDataDir); // restore from a backup.
InitWarning(msg);
} }
if (r == CDBEnv::RECOVER_FAIL) { if (r == CDBEnv::RECOVER_FAIL) {
return InitError(_("wallet.dat corrupt, salvage failed")); return InitError(_("wallet.dat corrupt, salvage failed"));
@ -230,8 +230,9 @@ bool AppInit3(boost::thread_group& threadGroup) {
// If the loaded chain has a wrong genesis, bail out immediately // If the loaded chain has a wrong genesis, bail out immediately
// (we're likely using a testnet datadir, or the other way around). // (we're likely using a testnet datadir, or the other way around).
if (!mapBlockIndex.empty() && chainActive.Genesis() == NULL) if (!mapBlockIndex.empty() && chainActive.Genesis() == NULL) {
return InitError(_("Incorrect or no genesis block found. Wrong datadir for network?")); return InitError(_("Incorrect or no genesis block found. Wrong datadir for network?"));
}
// Initialize the block index (no-op if non-empty database was already loaded) // Initialize the block index (no-op if non-empty database was already loaded)
if (!InitBlockIndex()) { if (!InitBlockIndex()) {
@ -299,9 +300,8 @@ bool AppInit3(boost::thread_group& threadGroup) {
if (nLoadWalletRet == DB_CORRUPT) { if (nLoadWalletRet == DB_CORRUPT) {
strErrors << _("Error loading wallet.dat: Wallet corrupted") << "\n"; strErrors << _("Error loading wallet.dat: Wallet corrupted") << "\n";
} else if (nLoadWalletRet == DB_NONCRITICAL_ERROR) { } else if (nLoadWalletRet == DB_NONCRITICAL_ERROR) {
string msg(_("Warning: error reading wallet.dat! All keys read correctly, but transaction data" // Warning: error reading wallet.dat! All keys read correctly, but transaction data
" or address book entries might be missing or incorrect.")); // or address book entries might be missing or incorrect.
InitWarning(msg);
} else if (nLoadWalletRet == DB_TOO_NEW) { } else if (nLoadWalletRet == DB_TOO_NEW) {
strErrors << _("Error loading wallet.dat: Wallet requires newer version of Bitcoin Core") << "\n"; strErrors << _("Error loading wallet.dat: Wallet requires newer version of Bitcoin Core") << "\n";
} else if (nLoadWalletRet == DB_NEED_REWRITE) { } else if (nLoadWalletRet == DB_NEED_REWRITE) {