diff options
| author | Gavin Andresen <[email protected]> | 2011-12-20 08:52:22 -0800 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2011-12-20 08:52:22 -0800 |
| commit | 74f5435e104be76cd342a9a196ed4a10b8a7e248 (patch) | |
| tree | 254f76dfa15c36a359e661caa1b4cfd158e204f4 /src/main.cpp | |
| parent | Merge pull request #690 from runeksvendsen/qt-cmdline-options-parsing (diff) | |
| parent | Code cleanup: use ECDSA_size() instead of fixed 10,000 byte sig buffer, and e... (diff) | |
| download | discoin-74f5435e104be76cd342a9a196ed4a10b8a7e248.tar.xz discoin-74f5435e104be76cd342a9a196ed4a10b8a7e248.zip | |
Merge pull request #716 from gavinandresen/cleanup
Cleanups suggested by genjix
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index 052701e5f..e2f3cc9f8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -366,7 +366,7 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi return DoS(100, error("AcceptToMemoryPool() : coinbase as individual tx")); // To help v0.1.5 clients who would see it as a negative number - if ((int64)nLockTime > INT_MAX) + if ((int64)nLockTime > std::numeric_limits<int>::max()) return error("AcceptToMemoryPool() : not accepting nLockTime beyond 2038 yet"); // Safety limits @@ -1875,7 +1875,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) } // Ask the first connected node for block updates - static int nAskedForBlocks; + static int nAskedForBlocks = 0; if (!pfrom->fClient && (pfrom->nVersion < 32000 || pfrom->nVersion >= 32400) && (nAskedForBlocks < 1 || vNodes.size() <= 1)) |