diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-10-07 09:31:04 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-10-07 09:31:12 +0200 |
| commit | 283a73d7eaea2907a6f7f800f529a0d6db53d7a6 (patch) | |
| tree | 524eee84363e242673e8b7f3896f9319c7f06506 | |
| parent | db88db47278d2e7208c50d16ab10cb355067d071 (diff) | |
| parent | d103484fe81a8a5bf1d692f3f7d1c0ef1be5f63c (diff) | |
Merge #20092: util: Do not use gArgs global in ArgsManager member functions
d103484fe81a8a5bf1d692f3f7d1c0ef1be5f63c util: Do not use gArgs global in ArgsManager member functions (Hennadii Stepanov)
Pull request description:
ACKs for top commit:
practicalswift:
ACK d103484fe81a8a5bf1d692f3f7d1c0ef1be5f63c: patch looks correct
Tree-SHA512: dda7a5062363170c6995f2fd8fda48c0a919e5ca67be9faa8f0fa66f9d3b535f134eb6f4860a0859bc5457c02230b34a8d1264045f22bed8d30668158ac2271f
| -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 41715aac1a..a411b73a16 100644 --- a/src/util/system.cpp +++ b/src/util/system.cpp @@ -523,7 +523,7 @@ void ArgsManager::AddHiddenArgs(const std::vector<std::string>& names) std::string ArgsManager::GetHelpMessage() const { - const bool show_debug = gArgs.GetBoolArg("-help-debug", false); + const bool show_debug = GetBoolArg("-help-debug", false); std::string usage = ""; LOCK(cs_args); @@ -900,7 +900,7 @@ bool ArgsManager::ReadConfigFiles(std::string& error, bool ignore_invalid_keys) // If datadir is changed in .conf file: ClearDatadirCache(); if (!CheckDataDirOption()) { - error = strprintf("specified data directory \"%s\" does not exist.", gArgs.GetArg("-datadir", "")); + error = strprintf("specified data directory \"%s\" does not exist.", GetArg("-datadir", "")); return false; } return true; |