Mercurial > hg > bitcoin
diff src/bitcoinrpc.cpp @ 2311:20e40ae0d404 draft
Add casts for unavoidable signed/unsigned comparisons
At these code sites, it is preferable to cast rather than change
a variable's type.
| author | Jeff Garzik <jgarzik@exmulti.com> |
|---|---|
| date | Sun, 22 Apr 2012 13:51:16 -0400 (2012-04-22) |
| parents | bc7f29fbeed5 |
| children | b155de017684 fdc6cf75cafa |
line wrap: on
line diff
--- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -999,7 +999,7 @@ 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 @@ } // 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 @@ // Read header int nLen = ReadHTTPHeader(stream, mapHeadersRet); - if (nLen < 0 || nLen > MAX_SIZE) + if (nLen < 0 || nLen > (int)MAX_SIZE) return 500; // Read message