highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-04-23 13:29:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

blockstorage, refactor: pass GetFirstStoredBlock() start_block by reference

Browse Source 
instead of by pointer, so as to not accept a nullptr.
This commit is contained in:
Jon Atack
2022-04-28 11:15:38 +02:00
parent ed12c0a49d
commit 86ce844d3b
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/node/blockstorage.cpp
View File

@@ -390,11 +390,10 @@ bool BlockManager::IsBlockPruned(const CBlockIndex* pblockindex)
return (m_have_pruned && !(pblockindex->nStatus & BLOCK_HAVE_DATA) && pblockindex->nTx > 0);
}
const CBlockIndex* BlockManager::GetFirstStoredBlock(const CBlockIndex* start_block)
const CBlockIndex* BlockManager::GetFirstStoredBlock(const CBlockIndex& start_block)
{
AssertLockHeld(::cs_main);
assert(start_block);
const CBlockIndex* last_block = start_block;
const CBlockIndex* last_block = &start_block;
while (last_block->pprev && (last_block->pprev->nStatus & BLOCK_HAVE_DATA)) {
last_block = last_block->pprev;
}

2
src/node/blockstorage.h
View File

@@ -179,7 +179,7 @@ public:
const CBlockIndex* GetLastCheckpoint(const CCheckpointData& data) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
//! Find the first block that is not pruned
const CBlockIndex* GetFirstStoredBlock(const CBlockIndex* start_block) EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
const CBlockIndex* GetFirstStoredBlock(const CBlockIndex& start_block) EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
/** True if any block files have ever been pruned. */
bool m_have_pruned = false;