diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-09-21 06:04:27 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-09-21 06:04:27 -0700 |
| commit | e96a8c7d86203f463c07d7552190b508ce6c011d (patch) | |
| tree | 59cffaf563b74fe77d570a2e5e62694c617a0e9b /src/main.h | |
| parent | 3ccbaa56f42d2c6fcb424b641ec84a138f0ee9bc (diff) | |
| parent | 463a1cab43fda24f89f71fffc876756dc1bc155a (diff) | |
| download | bitcoin-e96a8c7d86203f463c07d7552190b508ce6c011d.tar.xz | |
Merge pull request #1793 from Diapolo/fix_signed_unsigned_strprintf
fix signed/unsigned in strprintf and CNetAddr::GetByte()
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main.h b/src/main.h index 2e208fed4f..770c202338 100644 --- a/src/main.h +++ b/src/main.h @@ -158,7 +158,7 @@ public: if (IsNull()) return "null"; else - return strprintf("(nFile=%d, nBlockPos=%d, nTxPos=%d)", nFile, nBlockPos, nTxPos); + return strprintf("(nFile=%u, nBlockPos=%u, nTxPos=%u)", nFile, nBlockPos, nTxPos); } void print() const @@ -214,7 +214,7 @@ public: std::string ToString() const { - return strprintf("COutPoint(%s, %d)", hash.ToString().substr(0,10).c_str(), n); + return strprintf("COutPoint(%s, %u)", hash.ToString().substr(0,10).c_str(), n); } void print() const @@ -586,7 +586,7 @@ public: std::string ToString() const { std::string str; - str += strprintf("CTransaction(hash=%s, ver=%d, vin.size=%d, vout.size=%d, nLockTime=%d)\n", + str += strprintf("CTransaction(hash=%s, ver=%d, vin.size=%u, vout.size=%u, nLockTime=%u)\n", GetHash().ToString().substr(0,10).c_str(), nVersion, vin.size(), @@ -1128,7 +1128,7 @@ public: std::string ToString() const { - return strprintf("CBlockIndex(pprev=%08x, pnext=%08x, nFile=%d, nBlockPos=%-6d nHeight=%d, merkle=%s, hashBlock=%s)", + return strprintf("CBlockIndex(pprev=%08x, pnext=%08x, nFile=%u, nBlockPos=%-6u nHeight=%d, merkle=%s, hashBlock=%s)", pprev, pnext, nFile, nBlockPos, nHeight, hashMerkleRoot.ToString().substr(0,10).c_str(), GetBlockHash().ToString().substr(0,20).c_str()); |