diff options
| author | Jeff Garzik <jgarzik@exmulti.com> | 2011-07-13 08:55:49 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@exmulti.com> | 2011-07-13 08:55:49 -0700 |
| commit | 9cd22ab86296ae7039132423c7f9847bdc19a644 (patch) | |
| tree | fa4b9052a436d83851ae86be3a614fa79f45cb90 /src | |
| parent | b8cbbc2c28679295a5cfb7ac553ee81dd950fbf5 (diff) | |
| parent | 84c3c2ebe76dcf70f65397758840a9d6b1a0605a (diff) | |
| download | bitcoin-9cd22ab86296ae7039132423c7f9847bdc19a644.tar.xz | |
Merge pull request #406 from muggenhor/warning-fixes
Warning fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/rpc.cpp | 4 | ||||
| -rw-r--r-- | src/wallet.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/rpc.cpp b/src/rpc.cpp index 4016d265c4..fa14fc0b2f 100644 --- a/src/rpc.cpp +++ b/src/rpc.cpp @@ -765,9 +765,9 @@ Value movecmd(const Array& params, bool fHelp) string strFrom = AccountFromValue(params[0]); string strTo = AccountFromValue(params[1]); int64 nAmount = AmountFromValue(params[2]); - int nMinDepth = 1; 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; if (params.size() > 4) strComment = params[4].get_str(); diff --git a/src/wallet.cpp b/src/wallet.cpp index 6869790472..f275853528 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -23,6 +23,7 @@ bool CWallet::AddKey(const CKey& key) return true; if (!IsCrypted()) return CWalletDB(strWalletFile).WriteKey(key.GetPubKey(), key.GetPrivKey()); + return true; } bool CWallet::AddCryptedKey(const vector<unsigned char> &vchPubKey, const vector<unsigned char> &vchCryptedSecret) |