diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-08-14 17:19:14 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-08-14 17:19:38 +0200 |
commit | c2704ec98a1b7b35b6a7c1b6b26a3f16d44e8880 (patch) | |
tree | 1a5a6899ff01632822303c4a211f90976a457e82 /src/util.cpp | |
parent | 1227be30ecff2bdf9f88213f356e1b4a2b28543a (diff) | |
parent | fcbde9091e7cd644237010f16f27052ac3b0d1ad (diff) | |
download | bitcoin-c2704ec98a1b7b35b6a7c1b6b26a3f16d44e8880.tar.xz |
Merge #10607: scripted-diff: stop using the gArgs wrappers
fcbde90 remove unused gArgs wrappers (Marko Bencun)
bb81e17 scripted-diff: stop using the gArgs wrappers (Marko Bencun)
Tree-SHA512: 49190740dfc723d680a093b625bf4e4e010bc121741b035d790f787e73eedd74966e4ceaf56975050d06b5d7d6cd8f46f9deb5cc78569df1e9faf0d7e543ee21
Diffstat (limited to 'src/util.cpp')
-rw-r--r-- | src/util.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/util.cpp b/src/util.cpp index fc75b7ef85..ba563478fa 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -564,8 +564,8 @@ const fs::path &GetDataDir(bool fNetSpecific) if (!path.empty()) return path; - if (IsArgSet("-datadir")) { - path = fs::system_complete(GetArg("-datadir", "")); + if (gArgs.IsArgSet("-datadir")) { + path = fs::system_complete(gArgs.GetArg("-datadir", "")); if (!fs::is_directory(path)) { path = ""; return path; @@ -627,7 +627,7 @@ void ArgsManager::ReadConfigFile(const std::string& confPath) #ifndef WIN32 fs::path GetPidFile() { - fs::path pathPidFile(GetArg("-pid", BITCOIN_PID_FILENAME)); + fs::path pathPidFile(gArgs.GetArg("-pid", BITCOIN_PID_FILENAME)); if (!pathPidFile.is_complete()) pathPidFile = GetDataDir() / pathPidFile; return pathPidFile; } |