maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge #9013: Trivial: Explicitly pass const CChainParams& to LoadBlockIndexDB()

Browse source 
d0b01f3 Explicitly pass const CChainParams& to LoadBlockIndexDB() (Geoffrey Tsui)
This commit is contained in:
Wladimir J. van der Laan 2016-11-02 21:09:24 +01:00
parent bc785d7185 d0b01f3a85
commit c05db83488
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/init.cpp
View file

@ -1323,7 +1323,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
CleanupBlockRevFiles();
}
if (!LoadBlockIndex()) {
if (!LoadBlockIndex(chainparams)) {
strLoadError = _("Error loading block database");
break;
}

7
src/main.cpp
View file

@ -3972,9 +3972,8 @@ CBlockIndex * InsertBlockIndex(uint256 hash)
return pindexNew;
}
bool static LoadBlockIndexDB()
bool static LoadBlockIndexDB(const CChainParams& chainparams)
{
const CChainParams& chainparams = Params();
if (!pblocktree->LoadBlockIndexGuts(InsertBlockIndex))
return false;
@ -4303,10 +4302,10 @@ void UnloadBlockIndex()
fHavePruned = false;
}
bool LoadBlockIndex()
bool LoadBlockIndex(const CChainParams& chainparams)
{
// Load block index from databases
if (!fReindex && !LoadBlockIndexDB())
if (!fReindex && !LoadBlockIndexDB(chainparams))
return false;
return true;
}

2
src/main.h
View file

@ -237,7 +237,7 @@ bool LoadExternalBlockFile(const CChainParams& chainparams, FILE* fileIn, CDiskB
/** Initialize a new block tree database + block data on disk */
bool InitBlockIndex(const CChainParams& chainparams);
/** Load the block tree and coins database from disk */
bool LoadBlockIndex();
bool LoadBlockIndex(const CChainParams& chainparams);
/** Unload database information */
void UnloadBlockIndex();
/** Run an instance of the script checking thread */