oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

config/Global: _get_path() throws exception on error

Browse Source
This commit is contained in:
Max Kellermann
2016-11-02 10:01:29 +01:00
parent 5a63d1d5a4
commit d765182bbb
4 changed files with 25 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/config/ConfigGlobal.cxx
View File

@@ -28,7 +28,6 @@
#include "ConfigError.hxx"
#include "fs/Path.hxx"
#include "fs/AllocatedPath.hxx"
#include "util/Error.hxx"
#include "system/FatalError.hxx"
#include "Log.hxx"
@@ -122,13 +121,13 @@ config_get_string(ConfigOption option, const char *default_value)
}
AllocatedPath
config_get_path(ConfigOption option, Error &error)
config_get_path(ConfigOption option)
{
const auto *param = config_get_param(option);
if (param == nullptr)
return AllocatedPath::Null();
return param->GetPath(error);
return param->GetPath();
}
unsigned

8
src/config/ConfigGlobal.hxx
View File

@@ -23,7 +23,6 @@
#include "ConfigOption.hxx"
#include "Compiler.h"
class Error;
class Path;
class AllocatedPath;
struct ConfigParam;
@@ -78,11 +77,12 @@ config_get_string(enum ConfigOption option, const char *default_value=nullptr);
/**
* Returns an optional configuration variable which contains an
* absolute path. If there is a tilde prefix, it is expanded.
* Returns AllocatedPath::Null() if the value is not present. If the path
* could not be parsed, returns AllocatedPath::Null() and sets the error.
* Returns AllocatedPath::Null() if the value is not present.
*
* Throws #std::runtime_error on error.
*/
AllocatedPath
config_get_path(enum ConfigOption option, Error &error);
config_get_path(enum ConfigOption option);
gcc_pure
unsigned