highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-10-11 12:03:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

init: Pass reference to ArgsManager around instead of relying on global

Browse Source
This commit is contained in:
MarcoFalke
2020-08-21 20:13:40 +02:00
parent 197450f808
commit fa40017706
5 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/bitcoind.cpp
View File

@@ -50,11 +50,9 @@ static bool AppInit(int argc, char* argv[])
util::ThreadSetInternalName("init");
//
// Parameters
//
// If Qt is used, parameters/bitcoin.conf are parsed in qt/bitcoin.cpp's main()
SetupServerArgs(node);
ArgsManager& args = *Assert(node.args);
std::string error;
if (!gArgs.ParseParameters(argc, argv, error)) {
return InitError(Untranslated(strprintf("Error parsing command line arguments: %s\n", error)));
@@ -109,15 +107,13 @@ static bool AppInit(int argc, char* argv[])
// -server defaults to true for bitcoind but not for the GUI so do this here
gArgs.SoftSetBoolArg("-server", true);
// Set this early so that parameter interactions go to console
InitLogging();
InitParameterInteraction();
if (!AppInitBasicSetup())
{
InitLogging(args);
InitParameterInteraction(args);
if (!AppInitBasicSetup(args)) {
// InitError will have been called with detailed error, which ends up on console
return false;
}
if (!AppInitParameterInteraction())
{
if (!AppInitParameterInteraction(args)) {
// InitError will have been called with detailed error, which ends up on console
return false;
}