Skip to content

Commit 283a73d

Browse files
author
MarcoFalke
committed
Merge #20092: util: Do not use gArgs global in ArgsManager member functions
d103484 util: Do not use gArgs global in ArgsManager member functions (Hennadii Stepanov) Pull request description: ACKs for top commit: practicalswift: ACK d103484: patch looks correct Tree-SHA512: dda7a5062363170c6995f2fd8fda48c0a919e5ca67be9faa8f0fa66f9d3b535f134eb6f4860a0859bc5457c02230b34a8d1264045f22bed8d30668158ac2271f
2 parents db88db4 + d103484 commit 283a73d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/util/system.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ void ArgsManager::AddHiddenArgs(const std::vector<std::string>& names)
523523

524524
std::string ArgsManager::GetHelpMessage() const
525525
{
526-
const bool show_debug = gArgs.GetBoolArg("-help-debug", false);
526+
const bool show_debug = GetBoolArg("-help-debug", false);
527527

528528
std::string usage = "";
529529
LOCK(cs_args);
@@ -900,7 +900,7 @@ bool ArgsManager::ReadConfigFiles(std::string& error, bool ignore_invalid_keys)
900900
// If datadir is changed in .conf file:
901901
ClearDatadirCache();
902902
if (!CheckDataDirOption()) {
903-
error = strprintf("specified data directory \"%s\" does not exist.", gArgs.GetArg("-datadir", ""));
903+
error = strprintf("specified data directory \"%s\" does not exist.", GetArg("-datadir", ""));
904904
return false;
905905
}
906906
return true;

0 commit comments

Comments
 (0)