aboutsummaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/util')
-rw-r--r--src/util/system.cpp9
-rw-r--r--src/util/system.h6
2 files changed, 4 insertions, 11 deletions
diff --git a/src/util/system.cpp b/src/util/system.cpp
index 474c4893f9..9b3bd46b38 100644
--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@@ -445,7 +445,7 @@ const fs::path& ArgsManager::GetDataDirPath(bool net_specific) const
return path;
}
-void ArgsManager::ClearDatadirPathCache()
+void ArgsManager::ClearPathCache()
{
LOCK(cs_args);
@@ -813,11 +813,6 @@ bool CheckDataDirOption()
return datadir.empty() || fs::is_directory(fs::system_complete(datadir));
}
-void ClearDatadirCache()
-{
- gArgs.ClearDatadirPathCache();
-}
-
fs::path GetConfigFile(const std::string& confPath)
{
return AbsPathForConfigVal(fs::path(confPath), false);
@@ -976,7 +971,7 @@ bool ArgsManager::ReadConfigFiles(std::string& error, bool ignore_invalid_keys)
}
// If datadir is changed in .conf file:
- ClearDatadirCache();
+ gArgs.ClearPathCache();
if (!CheckDataDirOption()) {
error = strprintf("specified data directory \"%s\" does not exist.", GetArg("-datadir", ""));
return false;
diff --git a/src/util/system.h b/src/util/system.h
index fcdb04bb8d..61f862c93a 100644
--- a/src/util/system.h
+++ b/src/util/system.h
@@ -94,8 +94,6 @@ fs::path GetDefaultDataDir();
const fs::path &GetDataDir(bool fNetSpecific = true);
// Return true if -datadir option points to a valid directory or is not specified.
bool CheckDataDirOption();
-/** Tests only */
-void ClearDatadirCache();
fs::path GetConfigFile(const std::string& confPath);
#ifdef WIN32
fs::path GetSpecialFolderPath(int nFolder, bool fCreate = true);
@@ -281,9 +279,9 @@ public:
const fs::path& GetDataDirPath(bool net_specific = true) const;
/**
- * For testing
+ * Clear cached directory paths
*/
- void ClearDatadirPathCache();
+ void ClearPathCache();
/**
* Return a vector of strings of the given argument