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

ConfigGlobal: eliminate function config_get_next_param()

Browse Source
This commit is contained in:
Max Kellermann
2014-02-19 23:57:55 +01:00
parent 9e0ce23a03
commit 008723c62f
6 changed files with 16 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/config/ConfigGlobal.cxx
View File

@@ -74,12 +74,10 @@ void config_global_check(void)
Check(p);
}
const struct config_param *
config_get_next_param(ConfigOption option, const struct config_param * last)
const config_param *
config_get_param(ConfigOption option)
{
config_param *param = last != nullptr
? last->next
: config_data.params[unsigned(option)];
config_param *param = config_data.params[unsigned(option)];
if (param != nullptr)
param->used = true;
return param;
@@ -88,8 +86,8 @@ config_get_next_param(ConfigOption option, const struct config_param * last)
const config_param *
config_find_block(ConfigOption option, const char *key, const char *value)
{
const config_param *param = nullptr;
while ((param = config_get_next_param(option, param)) != nullptr) {
for (const config_param *param = config_get_param(option);
param != nullptr; param = param->next) {
const char *value2 = param->GetBlockValue(key);
if (value2 == nullptr)
FormatFatalError("block without '%s' name in line %d",

15
src/config/ConfigGlobal.hxx
View File

@@ -26,6 +26,7 @@
class Error;
class Path;
class AllocatedPath;
struct config_param;
void config_global_init(void);
void config_global_finish(void);
@@ -39,19 +40,9 @@ void config_global_check(void);
bool
ReadConfigFile(Path path, Error &error);
/* don't free the returned value
set _last_ to nullptr to get first entry */
gcc_pure
const struct config_param *
config_get_next_param(enum ConfigOption option,
const struct config_param *last);
gcc_pure
static inline const struct config_param *
config_get_param(enum ConfigOption option)
{
return config_get_next_param(option, nullptr);
}
const config_param *
config_get_param(enum ConfigOption option);
/**
* Find a block with a matching attribute.