mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Clean up includeconf comments

Browse Source 
Suggested by Antoine Riard <ariard@student.42.fr>
https://github.com/bitcoin/bitcoin/pull/15934#discussion_r344291875

and John Newbery <john@johnnewbery.com>
https://github.com/bitcoin/bitcoin/pull/15934#discussion_r344271224

This commit does not change behavior.
This commit is contained in:
Russell Yanofsky committed 2019-11-13 04:20:30 -05:00
1 parent 3f7dc9b808
commit 57e8b7a727
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/util/system.cpp
+2 -2
View File
@@ -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; bool success = true;
if (auto* includes = util::FindKey(m_settings.command_line_options, "includeconf")) { if (auto* includes = util::FindKey(m_settings.command_line_options, "includeconf")) {
for (const auto& include : util::SettingsSpan(*includes)) { for (const auto& include : util::SettingsSpan(*includes)) {
@@ -780,7 +780,7 @@ bool ArgsManager::ReadConfigFiles(std::string& error, bool ignore_invalid_keys)
return false; return false;
} }
// `-includeconf` cannot be included in the command line arguments except // `-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}; bool use_conf_file{true};
{ {
LOCK(cs_args); LOCK(cs_args);