From 93752b8a3934468942d235b3920162c36384b45a Mon Sep 17 00:00:00 2001 From: Giel van Schijndel Date: Wed, 13 Jul 2011 13:43:24 +0200 Subject: [PATCH 1/2] =?UTF-8?q?fix=20warning:=20variable=20=E2=80=98nMinDe?= =?UTF-8?q?pth=E2=80=99=20set=20but=20not=20used=20[-Wunused-but-set-varia?= =?UTF-8?q?ble]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Giel van Schijndel --- src/rpc.cpp | 4 ++-- 1 file changed, 2 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(); From 84c3c2ebe76dcf70f65397758840a9d6b1a0605a Mon Sep 17 00:00:00 2001 From: Giel van Schijndel Date: Wed, 13 Jul 2011 13:43:50 +0200 Subject: [PATCH 2/2] fix warning: control reaches end of non-void function [-Wreturn-type] Signed-off-by: Giel van Schijndel --- src/wallet.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/wallet.cpp b/src/wallet.cpp index a60b0b4fa5..68283c9e80 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 &vchPubKey, const vector &vchCryptedSecret)