Skip to content

Commit

Permalink
refactor: Clean up includeconf comments
Browse files Browse the repository at this point in the history
Suggested by Antoine Riard <[email protected]>
bitcoin#15934 (comment)

and John Newbery <[email protected]>
bitcoin#15934 (comment)

This commit does not change behavior.
  • Loading branch information
ryanofsky committed Nov 13, 2019
1 parent 3f7dc9b commit 57e8b7a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/util/system.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ bool ArgsManager::ParseParameters(int argc, const char* const argv[], std::strin
}
}

// we do not allow -includeconf from command line, so we clear it here
// we do not allow -includeconf from command line
bool success = true;
if (auto* includes = util::FindKey(m_settings.command_line_options, "includeconf")) {
for (const auto& include : util::SettingsSpan(*includes)) {
Expand Down Expand Up @@ -780,7 +780,7 @@ bool ArgsManager::ReadConfigFiles(std::string& error, bool ignore_invalid_keys)
return false;
}
// `-includeconf` cannot be included in the command line arguments except
// as `-noincludeconf` (which indicates that no conf file should be used).
// as `-noincludeconf` (which indicates that no included conf file should be used).
bool use_conf_file{true};
{
LOCK(cs_args);
Expand Down

0 comments on commit 57e8b7a

Please sign in to comment.