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

config/Data: add method FindBlock()

Browse Source
This commit is contained in:
Max Kellermann 2018-07-17 21:14:53 +02:00
parent 33deb84aa1
commit 15c36baefd
3 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/config/Data.cxx
View File

@ -21,6 +21,8 @@
#include "Data.hxx"
#include "Param.hxx"
#include "Block.hxx"
#include "system/FatalError.hxx"
#include "util/StringAPI.hxx"
void
ConfigData::Clear()
@ -35,3 +37,21 @@ ConfigData::Clear()
i = nullptr;
}
}
const ConfigBlock *
ConfigData::FindBlock(ConfigBlockOption option,
const char *key, const char *value) const noexcept
{
for (const auto *block = GetBlock(option);
block != nullptr; block = block->next) {
const char *value2 = block->GetBlockValue(key);
if (value2 == nullptr)
FormatFatalError("block without '%s' in line %d",
key, block->line);
if (StringIsEqual(value2, value))
return block;
}
return nullptr;
}

4
src/config/Data.hxx
View File

@ -42,6 +42,10 @@ struct ConfigData {
const ConfigBlock *GetBlock(ConfigBlockOption option) const noexcept {
return blocks[size_t(option)];
}
gcc_pure
const ConfigBlock *FindBlock(ConfigBlockOption option,
const char *key, const char *value) const noexcept;
};
#endif

13
src/config/Global.cxx
View File

@ -89,18 +89,7 @@ config_get_block(ConfigBlockOption option) noexcept
const ConfigBlock *
config_find_block(ConfigBlockOption option, const char *key, const char *value)
{
for (const auto *block = config_get_block(option);
block != nullptr; block = block->next) {
const char *value2 = block->GetBlockValue(key);
if (value2 == nullptr)
FormatFatalError("block without '%s' name in line %d",
key, block->line);
if (strcmp(value2, value) == 0)
return block;
}
return nullptr;
return config_data.FindBlock(option, key, value);
}
const char *