diff options
| author | Jorge Timón <jtimon@jtimon.cc> | 2016-09-28 10:10:15 +0200 |
|---|---|---|
| committer | Jorge Timón <jtimon@jtimon.cc> | 2016-10-01 08:12:19 +0200 |
| commit | 3450c18a125f125aec76bfef79c69317eaad935d (patch) | |
| tree | d41fdcefaab3cc63947a22d3960b22107cbb35f8 /src/util.h | |
| parent | 7b784cc2bbcdc90361add2adb657c58162aca4ef (diff) | |
Globals: Decouple GetConfigFile and ReadConfigFile from global mapArgs
Diffstat (limited to 'src/util.h')
| -rw-r--r-- | src/util.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/util.h b/src/util.h index 45b3658557..bbb9b5db82 100644 --- a/src/util.h +++ b/src/util.h @@ -102,12 +102,12 @@ bool TryCreateDirectory(const boost::filesystem::path& p); boost::filesystem::path GetDefaultDataDir(); const boost::filesystem::path &GetDataDir(bool fNetSpecific = true); void ClearDatadirCache(); -boost::filesystem::path GetConfigFile(); +boost::filesystem::path GetConfigFile(const std::string& confPath); #ifndef WIN32 boost::filesystem::path GetPidFile(); void CreatePidFile(const boost::filesystem::path &path, pid_t pid); #endif -void ReadConfigFile(std::map<std::string, std::string>& mapSettingsRet, std::map<std::string, std::vector<std::string> >& mapMultiSettingsRet); +void ReadConfigFile(const std::string& confPath, std::map<std::string, std::string>& mapSettingsRet, std::map<std::string, std::vector<std::string> >& mapMultiSettingsRet); #ifdef WIN32 boost::filesystem::path GetSpecialFolderPath(int nFolder, bool fCreate = true); #endif |