diff options
author | Jeff Garzik <jgarzik@exmulti.com> | 2012-04-23 21:33:29 -0700 |
---|---|---|
committer | Jeff Garzik <jgarzik@exmulti.com> | 2012-04-23 21:33:29 -0700 |
commit | c2e8c8acd8ae0c94c70b59f55169841ad195bb99 (patch) | |
tree | 13709f29a89f926f873c1e8eddc76ca22601aa5d /src/bitcoinrpc.cpp | |
parent | ef758662c595ca866ca7abe320452d785373314b (diff) | |
parent | 735a60698c845f257a0f7e9b617d50669d9179d4 (diff) | |
download | bitcoin-c2e8c8acd8ae0c94c70b59f55169841ad195bb99.tar.xz |
Merge pull request #1140 from jgarzik/sign-compare
Address many more sign comparison warnings
Diffstat (limited to 'src/bitcoinrpc.cpp')
-rw-r--r-- | src/bitcoinrpc.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 206347faf8..2262923911 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -999,7 +999,7 @@ Value addmultisigaddress(const Array& params, bool fHelp) strAccount = AccountFromValue(params[2]); // Gather public keys - if (nRequired < 1 || keys.size() < nRequired) + if ((nRequired < 1) || ((int)keys.size() < nRequired)) throw runtime_error( strprintf("wrong number of keys" "(got %d, need at least %d)", keys.size(), nRequired)); @@ -1331,8 +1331,10 @@ Value listtransactions(const Array& params, bool fHelp) } // ret is newest to oldest - if (nFrom > ret.size()) nFrom = ret.size(); - if (nFrom+nCount > ret.size()) nCount = ret.size()-nFrom; + if (nFrom > (int)ret.size()) + nFrom = ret.size(); + if ((nFrom + nCount) > (int)ret.size()) + nCount = ret.size() - nFrom; Array::iterator first = ret.begin(); std::advance(first, nFrom); Array::iterator last = ret.begin(); @@ -2202,7 +2204,7 @@ int ReadHTTP(std::basic_istream<char>& stream, map<string, string>& mapHeadersRe // Read header int nLen = ReadHTTPHeader(stream, mapHeadersRet); - if (nLen < 0 || nLen > MAX_SIZE) + if (nLen < 0 || nLen > (int)MAX_SIZE) return 500; // Read message |