Update CWallet::LoadWallet for proper return type.

14 years ago · 116df55e21
parent 4ea952d5c0
commit 116df55e21
3 changed files with 6 additions and 5 deletions
--- a/src/db.h
+++ b/src/db.h
@ -346,7 +346,8 @@ enum DBErrors
 {
    DB_LOAD_OK,
    DB_CORRUPT,
-    DB_TOO_NEW
+    DB_TOO_NEW,
+    DB_LOAD_FAIL,
 };

 class CWalletDB : public CDB
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@ -1122,7 +1122,7 @@ string CWallet::SendMoneyToBitcoinAddress(string strAddress, int64 nValue, CWall



-bool CWallet::LoadWallet(bool& fFirstRunRet)
+int CWallet::LoadWallet(bool& fFirstRunRet)
 {
    if (!fFileBacked)
        return false;
@ -1139,11 +1139,11 @@ bool CWallet::LoadWallet(bool& fFirstRunRet)

        SetDefaultKey(GetOrReuseKeyFromPool());
        if (!SetAddressBookName(PubKeyToAddress(vchDefaultKey), ""))
-            return false;
+            return DB_LOAD_FAIL;
    }

    CreateThread(ThreadFlushWalletDB, &strWalletFile);
-    return true;
+    return DB_LOAD_OK;
 }


--- a/src/wallet.h
+++ b/src/wallet.h
@ -167,7 +167,7 @@ public:
        walletdb.WriteBestBlock(loc);
    }

-    bool LoadWallet(bool& fFirstRunRet);
+    int LoadWallet(bool& fFirstRunRet);
 //    bool BackupWallet(const std::string& strDest);

    // requires cs_mapAddressBook lock