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

config/Global: allow calling config_get_string() with one argument

Browse Source 
default_value defaults to nullptr.
This commit is contained in:
Max Kellermann 2015-06-26 08:05:20 +02:00
parent df03a7b3f8
commit 58996b841a
7 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/ConfigGlobal.hxx
View File

@ -73,7 +73,7 @@ config_find_block(ConfigBlockOption option, const char *key, const char *value);
gcc_pure gcc_pure
const char * const char *
config_get_string(enum ConfigOption option, const char *default_value); config_get_string(enum ConfigOption option, const char *default_value=nullptr);
/** /**
* Returns an optional configuration variable which contains an * Returns an optional configuration variable which contains an

2
src/config/ConfigPath.cxx
View File

@ -70,7 +70,7 @@ GetHome(Error &error)
static AllocatedPath static AllocatedPath
GetConfiguredHome(Error &error) GetConfiguredHome(Error &error)
{ {
const char *user = config_get_string(ConfigOption::USER, nullptr); const char *user = config_get_string(ConfigOption::USER);
return user != nullptr return user != nullptr
? GetHome(user, error) ? GetHome(user, error)
: GetHome(error); : GetHome(error);

4
src/fs/Config.cxx
View File

@ -26,9 +26,7 @@ bool
ConfigureFS(Error &error) ConfigureFS(Error &error)
{ {
#ifdef HAVE_FS_CHARSET #ifdef HAVE_FS_CHARSET
const char *charset = nullptr; const char *charset = config_get_string(ConfigOption::FS_CHARSET);
charset = config_get_string(ConfigOption::FS_CHARSET, nullptr);
return charset == nullptr || SetFSCharset(charset, error); return charset == nullptr || SetFSCharset(charset, error);
#else #else
(void)error; (void)error;

4
src/input/plugins/CurlInputPlugin.cxx
View File

@ -566,9 +566,9 @@ input_curl_init(const ConfigBlock &block, Error &error)
if (proxy == nullptr) { if (proxy == nullptr) {
/* deprecated proxy configuration */ /* deprecated proxy configuration */
proxy = config_get_string(ConfigOption::HTTP_PROXY_HOST, nullptr); proxy = config_get_string(ConfigOption::HTTP_PROXY_HOST);
proxy_port = config_get_positive(ConfigOption::HTTP_PROXY_PORT, 0); proxy_port = config_get_positive(ConfigOption::HTTP_PROXY_PORT, 0);
proxy_user = config_get_string(ConfigOption::HTTP_PROXY_USER, nullptr); proxy_user = config_get_string(ConfigOption::HTTP_PROXY_USER);
proxy_password = config_get_string(ConfigOption::HTTP_PROXY_PASSWORD, proxy_password = config_get_string(ConfigOption::HTTP_PROXY_PASSWORD,
""); "");
} }

4
src/storage/Configured.cxx
View File

@ -68,7 +68,7 @@ CreateConfiguredStorage(EventLoop &event_loop, Error &error)
{ {
assert(!error.IsDefined()); assert(!error.IsDefined());
auto uri = config_get_string(ConfigOption::MUSIC_DIR, nullptr); auto uri = config_get_string(ConfigOption::MUSIC_DIR);
if (uri != nullptr && uri_has_scheme(uri)) if (uri != nullptr && uri_has_scheme(uri))
return CreateConfiguredStorageUri(event_loop, uri, error); return CreateConfiguredStorageUri(event_loop, uri, error);
@ -78,5 +78,5 @@ CreateConfiguredStorage(EventLoop &event_loop, Error &error)
bool bool
IsStorageConfigured() IsStorageConfigured()
{ {
return config_get_string(ConfigOption::MUSIC_DIR, nullptr) != nullptr; return config_get_string(ConfigOption::MUSIC_DIR) != nullptr;
} }

3
src/tag/TagConfig.cxx
View File

@ -35,8 +35,7 @@
void void
TagLoadConfig() TagLoadConfig()
{ {
const char *value = config_get_string(ConfigOption::METADATA_TO_USE, const char *value = config_get_string(ConfigOption::METADATA_TO_USE);
nullptr);
if (value == nullptr) if (value == nullptr)
return; return;

2
test/read_conf.cxx
View File

@ -47,7 +47,7 @@ int main(int argc, char **argv)
ConfigOption option = ParseConfigOptionName(name); ConfigOption option = ParseConfigOptionName(name);
const char *value = option != ConfigOption::MAX const char *value = option != ConfigOption::MAX
? config_get_string(option, nullptr) ? config_get_string(option)
: nullptr; : nullptr;
int ret; int ret;
if (value != NULL) { if (value != NULL) {