Merge pull request #4457

834e46e CBlockIndex()::SetNull() method to avoid code repetition (jtimon)
This commit is contained in:
Wladimir J. van der Laan 2014-07-07 07:44:22 +02:00
commit 4ed2315e86
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6

View File

@ -712,7 +712,7 @@ public:
// (memory only) Sequencial id assigned to distinguish order in which blocks are received. // (memory only) Sequencial id assigned to distinguish order in which blocks are received.
uint32_t nSequenceId; uint32_t nSequenceId;
CBlockIndex() void SetNull()
{ {
phashBlock = NULL; phashBlock = NULL;
pprev = NULL; pprev = NULL;
@ -734,20 +734,14 @@ public:
nNonce = 0; nNonce = 0;
} }
CBlockIndex()
{
SetNull();
}
CBlockIndex(CBlockHeader& block) CBlockIndex(CBlockHeader& block)
{ {
phashBlock = NULL; SetNull();
pprev = NULL;
pskip = NULL;
nHeight = 0;
nFile = 0;
nDataPos = 0;
nUndoPos = 0;
nChainWork = 0;
nTx = 0;
nChainTx = 0;
nStatus = 0;
nSequenceId = 0;
nVersion = block.nVersion; nVersion = block.nVersion;
hashMerkleRoot = block.hashMerkleRoot; hashMerkleRoot = block.hashMerkleRoot;