LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

remove unused gArgs wrappers

Browse source
This commit is contained in:
Marko Bencun 2017-06-15 22:45:55 +02:00 • committed by Wladimir J. van der Laan
parent bb81e17355
commit fcbde9091e
2 changed files with 3 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/util.cpp
View file

@ -564,8 +564,8 @@ const fs::path &GetDataDir(bool fNetSpecific)
if (!path.empty()) if (!path.empty())
return path; return path;
if (IsArgSet("-datadir")) { if (gArgs.IsArgSet("-datadir")) {
path = fs::system_complete(GetArg("-datadir", "")); path = fs::system_complete(gArgs.GetArg("-datadir", ""));
if (!fs::is_directory(path)) { if (!fs::is_directory(path)) {
path = ""; path = "";
return path; return path;
@ -627,7 +627,7 @@ void ArgsManager::ReadConfigFile(const std::string& confPath)
#ifndef WIN32 #ifndef WIN32
fs::path GetPidFile() 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; if (!pathPidFile.is_complete()) pathPidFile = GetDataDir() / pathPidFile;
return pathPidFile; return pathPidFile;
} }

46
src/util.h
View file

@ -263,52 +263,6 @@ public:
extern ArgsManager gArgs; extern ArgsManager gArgs;
// wrappers using the global ArgsManager:
static inline void ParseParameters(int argc, const char*const argv[])
{
gArgs.ParseParameters(argc, argv);
}
static inline void ReadConfigFile(const std::string& confPath)
{
gArgs.ReadConfigFile(confPath);
}
static inline bool SoftSetArg(const std::string& strArg, const std::string& strValue)
{
return gArgs.SoftSetArg(strArg, strValue);
}
static inline void ForceSetArg(const std::string& strArg, const std::string& strValue)
{
gArgs.ForceSetArg(strArg, strValue);
}
static inline bool IsArgSet(const std::string& strArg)
{
return gArgs.IsArgSet(strArg);
}
static inline std::string GetArg(const std::string& strArg, const std::string& strDefault)
{
return gArgs.GetArg(strArg, strDefault);
}
static inline int64_t GetArg(const std::string& strArg, int64_t nDefault)
{
return gArgs.GetArg(strArg, nDefault);
}
static inline bool GetBoolArg(const std::string& strArg, bool fDefault)
{
return gArgs.GetBoolArg(strArg, fDefault);
}
static inline bool SoftSetBoolArg(const std::string& strArg, bool fValue)
{
return gArgs.SoftSetBoolArg(strArg, fValue);
}
/** /**
* Format a string to be used as group of options in help messages * Format a string to be used as group of options in help messages
* *