foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-03 09:56:38 -05:00
Code Issues Activity

Merge #20092: util: Do not use gArgs global in ArgsManager member functions

Browse source 
d103484fe8 util: Do not use gArgs global in ArgsManager member functions (Hennadii Stepanov)

Pull request description:

ACKs for top commit:
  practicalswift:
    ACK d103484fe8: patch looks correct

Tree-SHA512: dda7a5062363170c6995f2fd8fda48c0a919e5ca67be9faa8f0fa66f9d3b535f134eb6f4860a0859bc5457c02230b34a8d1264045f22bed8d30668158ac2271f
This commit is contained in:
MarcoFalke 2020-10-07 09:31:04 +02:00
commit 283a73d7ea
No known key found for this signature in database
GPG key ID: D2EA4850E7528B25
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/util/system.cpp
View file

@ -523,7 +523,7 @@ void ArgsManager::AddHiddenArgs(const std::vector<std::string>& names)
std::string ArgsManager::GetHelpMessage() const 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 = ""; std::string usage = "";
LOCK(cs_args); LOCK(cs_args);
@ -900,7 +900,7 @@ bool ArgsManager::ReadConfigFiles(std::string& error, bool ignore_invalid_keys)
// If datadir is changed in .conf file: // If datadir is changed in .conf file:
ClearDatadirCache(); ClearDatadirCache();
if (!CheckDataDirOption()) { 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 false;
} }
return true; return true;