Browse Source

Merge pull request #406 from muggenhor/warning-fixes

Warning fixes
miguelfreitas
Jeff Garzik 14 years ago
parent
commit
9cd22ab862
  1. 4
      src/rpc.cpp
  2. 1
      src/wallet.cpp

4
src/rpc.cpp

@ -765,9 +765,9 @@ Value movecmd(const Array& params, bool fHelp)
string strFrom = AccountFromValue(params[0]); string strFrom = AccountFromValue(params[0]);
string strTo = AccountFromValue(params[1]); string strTo = AccountFromValue(params[1]);
int64 nAmount = AmountFromValue(params[2]); int64 nAmount = AmountFromValue(params[2]);
int nMinDepth = 1;
if (params.size() > 3) if (params.size() > 3)
nMinDepth = params[3].get_int(); // unused parameter, used to be nMinDepth, keep type-checking it though
(void)params[3].get_int();
string strComment; string strComment;
if (params.size() > 4) if (params.size() > 4)
strComment = params[4].get_str(); strComment = params[4].get_str();

1
src/wallet.cpp

@ -23,6 +23,7 @@ bool CWallet::AddKey(const CKey& key)
return true; return true;
if (!IsCrypted()) if (!IsCrypted())
return CWalletDB(strWalletFile).WriteKey(key.GetPubKey(), key.GetPrivKey()); return CWalletDB(strWalletFile).WriteKey(key.GetPubKey(), key.GetPrivKey());
return true;
} }
bool CWallet::AddCryptedKey(const vector<unsigned char> &vchPubKey, const vector<unsigned char> &vchCryptedSecret) bool CWallet::AddCryptedKey(const vector<unsigned char> &vchPubKey, const vector<unsigned char> &vchCryptedSecret)

Loading…
Cancel
Save