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

config/File: move duplicate code to ExpectValueAndEnd()

Browse Source
This commit is contained in:
Max Kellermann 2018-07-17 20:14:43 +02:00
parent 7807ddae57
commit a4eeaff63f
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/config/File.cxx
View File

@ -40,6 +40,22 @@ static constexpr char CONF_COMMENT = '#';
static constexpr Domain config_file_domain("config_file"); static constexpr Domain config_file_domain("config_file");
/**
* Read a string value as the last token of a line. Throws on error.
*/
static auto
ExpectValueAndEnd(Tokenizer &tokenizer)
{
auto value = tokenizer.NextString();
if (!value)
throw std::runtime_error("Value missing");
if (!tokenizer.IsEnd() && tokenizer.CurrentChar() != CONF_COMMENT)
throw std::runtime_error("Unknown tokens after value");
return value;
}
static void static void
config_read_name_value(ConfigBlock &block, char *input, unsigned line) config_read_name_value(ConfigBlock &block, char *input, unsigned line)
{ {
@ -48,19 +64,14 @@ config_read_name_value(ConfigBlock &block, char *input, unsigned line)
const char *name = tokenizer.NextWord(); const char *name = tokenizer.NextWord();
assert(name != nullptr); assert(name != nullptr);
const char *value = tokenizer.NextString(); auto value = ExpectValueAndEnd(tokenizer);
if (value == nullptr)
throw std::runtime_error("Value missing");
if (!tokenizer.IsEnd() && tokenizer.CurrentChar() != CONF_COMMENT)
throw std::runtime_error("Unknown tokens after value");
const BlockParam *bp = block.GetBlockParam(name); const BlockParam *bp = block.GetBlockParam(name);
if (bp != nullptr) if (bp != nullptr)
throw FormatRuntimeError("\"%s\" is duplicate, first defined on line %i", throw FormatRuntimeError("\"%s\" is duplicate, first defined on line %i",
name, bp->line); name, bp->line);
block.AddBlockParam(name, value, line); block.AddBlockParam(name, std::move(value), line);
} }
static ConfigBlock * static ConfigBlock *
@ -171,14 +182,8 @@ ReadConfigParam(ConfigData &config_data, BufferedReader &reader,
/* now parse the block or the value */ /* now parse the block or the value */
const char *value = tokenizer.NextString(); auto *param = new ConfigParam(ExpectValueAndEnd(tokenizer),
if (value == nullptr) reader.GetLineNumber());
throw std::runtime_error("Value missing");
if (!tokenizer.IsEnd() && tokenizer.CurrentChar() != CONF_COMMENT)
throw std::runtime_error("Unknown tokens after value");
auto *param = new ConfigParam(value, reader.GetLineNumber());
Append(head, param); Append(head, param);
} }