Mercurial > hg > bitcoin

diff db.cpp @ 153:de492f5bf245 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
automatically change displayed address whenever it receives anything, added help and -? for daemon command line rpc commands, only relay addr messages to 5 random nodes to save bandwidth, started setting wtx.fFromMe flag, trickle out tx inventory messages to protect privacy -- version 0.2.10
author s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>
date Thu, 10 Jun 2010 23:10:30 +0000
parents d57f149af4c6
children a32c592fab07 e5950b5ebb02
line wrap: on
line diff
--- a/db.cpp
+++ b/db.cpp
@@ -511,9 +511,9 @@
 // CWalletDB
 //
 
-bool CWalletDB::LoadWallet(vector<unsigned char>& vchDefaultKeyRet)
+bool CWalletDB::LoadWallet()
 {
-    vchDefaultKeyRet.clear();
+    vchDefaultKey.clear();
     int nFileVersion = 0;
 
     // Modify defaults
@@ -587,7 +587,7 @@
             }
             else if (strType == "defaultkey")
             {
-                ssValue >> vchDefaultKeyRet;
+                ssValue >> vchDefaultKey;
             }
             else if (strType == "version")
             {
@@ -650,8 +650,7 @@
 bool LoadWallet(bool& fFirstRunRet)
 {
     fFirstRunRet = false;
-    vector<unsigned char> vchDefaultKey;
-    if (!CWalletDB("cr+").LoadWallet(vchDefaultKey))
+    if (!CWalletDB("cr+").LoadWallet())
         return false;
     fFirstRunRet = vchDefaultKey.empty();