Use std::numeric_limits<UNSIGNED>::max()) instead of (UNSIGNED)-1

This commit is contained in:
practicalswift
2018-12-04 13:16:30 +01:00
committed by Hennadii Stepanov
parent 6b82fc59eb
commit cf4b0327ed
4 changed files with 6 additions and 5 deletions

View File

@@ -8,6 +8,7 @@
#include <assert.h> #include <assert.h>
#include <cstring> #include <cstring>
#include <limits>
#include <stdexcept> #include <stdexcept>
#include <stdint.h> #include <stdint.h>
#include <string> #include <string>
@@ -189,7 +190,7 @@ public:
{ {
// prefix operator // prefix operator
int i = 0; int i = 0;
while (i < WIDTH && --pn[i] == (uint32_t)-1) while (i < WIDTH && --pn[i] == std::numeric_limits<uint32_t>::max())
i++; i++;
return *this; return *this;
} }

View File

@@ -761,7 +761,7 @@ protected:
public: public:
CBufferedFile(FILE *fileIn, uint64_t nBufSize, uint64_t nRewindIn, int nTypeIn, int nVersionIn) : CBufferedFile(FILE *fileIn, uint64_t nBufSize, uint64_t nRewindIn, int nTypeIn, int nVersionIn) :
nType(nTypeIn), nVersion(nVersionIn), nSrcPos(0), nReadPos(0), nReadLimit((uint64_t)(-1)), nRewind(nRewindIn), vchBuf(nBufSize, 0) nType(nTypeIn), nVersion(nVersionIn), nSrcPos(0), nReadPos(0), nReadLimit(std::numeric_limits<uint64_t>::max()), nRewind(nRewindIn), vchBuf(nBufSize, 0)
{ {
src = fileIn; src = fileIn;
} }
@@ -846,7 +846,7 @@ public:
// prevent reading beyond a certain position // prevent reading beyond a certain position
// no argument removes the limit // no argument removes the limit
bool SetLimit(uint64_t nPos = (uint64_t)(-1)) { bool SetLimit(uint64_t nPos = std::numeric_limits<uint64_t>::max()) {
if (nPos < nReadPos) if (nPos < nReadPos)
return false; return false;
nReadLimit = nPos; nReadLimit = nPos;

View File

@@ -200,7 +200,7 @@ BOOST_AUTO_TEST_CASE(varints)
} }
for (uint64_t i = 0; i < 100000000000ULL; i += 999999937) { for (uint64_t i = 0; i < 100000000000ULL; i += 999999937) {
uint64_t j = -1; uint64_t j = std::numeric_limits<uint64_t>::max();
ss >> VARINT(j); ss >> VARINT(j);
BOOST_CHECK_MESSAGE(i == j, "decoded:" << j << " expected:" << i); BOOST_CHECK_MESSAGE(i == j, "decoded:" << j << " expected:" << i);
} }

View File

@@ -105,7 +105,7 @@ void static RandomTransaction(CMutableTransaction &tx, bool fSingle) {
txin.prevout.hash = InsecureRand256(); txin.prevout.hash = InsecureRand256();
txin.prevout.n = InsecureRandBits(2); txin.prevout.n = InsecureRandBits(2);
RandomScript(txin.scriptSig); RandomScript(txin.scriptSig);
txin.nSequence = (InsecureRandBool()) ? InsecureRand32() : (unsigned int)-1; txin.nSequence = (InsecureRandBool()) ? InsecureRand32() : std::numeric_limits<uint32_t>::max();
} }
for (int out = 0; out < outs; out++) { for (int out = 0; out < outs; out++) {
tx.vout.push_back(CTxOut()); tx.vout.push_back(CTxOut());