diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-06-13 16:22:56 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-06-13 16:34:57 +0200 |
| commit | 73e218d44401513963700a0915d557119e9a3d84 (patch) | |
| tree | b97b6a96797394cce12479c833483475bbfdc833 /mullvad-daemon/src | |
| parent | 33230c43258826bebdbbcb3f19773b4a8b95b51a (diff) | |
| download | mullvadvpn-73e218d44401513963700a0915d557119e9a3d84.tar.xz mullvadvpn-73e218d44401513963700a0915d557119e9a3d84.zip | |
Rename mullvad-paths methods to have get_ if they don't create dirs
Diffstat (limited to 'mullvad-daemon/src')
| -rw-r--r-- | mullvad-daemon/src/main.rs | 2 | ||||
| -rw-r--r-- | mullvad-daemon/src/settings.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs index 5c18584b1f..43cc2e49e0 100644 --- a/mullvad-daemon/src/main.rs +++ b/mullvad-daemon/src/main.rs @@ -892,7 +892,7 @@ fn run_standalone(config: cli::Config) -> Result<()> { None }; let resource_dir = mullvad_paths::get_resource_dir(); - let cache_dir = mullvad_paths::get_cache_dir().chain_err(|| "Unable to get cache dir")?; + let cache_dir = mullvad_paths::cache_dir().chain_err(|| "Unable to get cache dir")?; let daemon = Daemon::new(log_dir, resource_dir, cache_dir).chain_err(|| "Unable to initialize daemon")?; diff --git a/mullvad-daemon/src/settings.rs b/mullvad-daemon/src/settings.rs index d3abd190d6..0ff007cce8 100644 --- a/mullvad-daemon/src/settings.rs +++ b/mullvad-daemon/src/settings.rs @@ -87,7 +87,7 @@ impl Settings { } fn get_settings_path() -> Result<PathBuf> { - let dir = ::mullvad_paths::get_settings_dir().chain_err(|| ErrorKind::DirectoryError)?; + let dir = ::mullvad_paths::settings_dir().chain_err(|| ErrorKind::DirectoryError)?; Ok(dir.join(SETTINGS_FILE)) } |