refactor: Clean up includeconf comments

ryanofsky · ryanofsky · commit 57e8b7a72735 · 2019-11-13T04:20:30.000-05:00
Suggested by Antoine Riard <ariard@student.42.fr> bitcoin#15934 (comment) and John Newbery <john@johnnewbery.com> bitcoin#15934 (comment) This commit does not change behavior.
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ bool ArgsManager::ParseParameters(int argc, const char* const argv[], std::strin`
`344`	`344`	`}`
`345`	`345`	`}`
`346`	`346`
`347`		`- // we do not allow -includeconf from command line, so we clear it here`
	`347`	`+ // we do not allow -includeconf from command line`
`348`	`348`	`bool success = true;`
`349`	`349`	`if (auto* includes = util::FindKey(m_settings.command_line_options, "includeconf")) {`
`350`	`350`	`for (const auto& include : util::SettingsSpan(*includes)) {`
`@@ -780,7 +780,7 @@ bool ArgsManager::ReadConfigFiles(std::string& error, bool ignore_invalid_keys)`
`780`	`780`	`return false;`
`781`	`781`	`}`
`782`	`782`	// `-includeconf` cannot be included in the command line arguments except
`783`		- // as `-noincludeconf` (which indicates that no conf file should be used).
	`783`	+ // as `-noincludeconf` (which indicates that no included conf file should be used).
`784`	`784`	`bool use_conf_file{true};`
`785`	`785`	`{`
`786`	`786`	`LOCK(cs_args);`