From 57e8b7a7273567aa4a4aee87cce18e9bff8f3196 Mon Sep 17 00:00:00 2001 From: Russell Yanofsky Date: Mon, 11 Nov 2019 18:40:52 -0500 Subject: refactor: Clean up includeconf comments Suggested by Antoine Riard https://github.com/bitcoin/bitcoin/pull/15934#discussion_r344291875 and John Newbery https://github.com/bitcoin/bitcoin/pull/15934#discussion_r344271224 This commit does not change behavior. --- src/util/system.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/util/system.cpp') diff --git a/src/util/system.cpp b/src/util/system.cpp index 2a2ae6fdf5..9043d02f0a 100644 --- a/src/util/system.cpp +++ b/src/util/system.cpp @@ -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)) { @@ -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); -- cgit v1.2.3