diff options
| author | Russell Yanofsky <russ@yanofsky.org> | 2019-11-11 18:40:52 -0500 |
|---|---|---|
| committer | Russell Yanofsky <russ@yanofsky.org> | 2019-11-13 04:20:30 -0500 |
| commit | 57e8b7a7273567aa4a4aee87cce18e9bff8f3196 (patch) | |
| tree | a2dae3a9da1ee978904a0e076dc583a5c2917276 /src/util/system.cpp | |
| parent | 3f7dc9b808316c1e5d677af8d9a99112568c8ccb (diff) | |
| download | bitcoin-57e8b7a7273567aa4a4aee87cce18e9bff8f3196.tar.xz | |
refactor: Clean up includeconf comments
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.
Diffstat (limited to 'src/util/system.cpp')
| -rw-r--r-- | src/util/system.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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); |