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

SongFilter: simplify Parse() loop

Browse Source 
Consume the ConstBuffer instead of iterating it.  This will allow
adding more complex parsers.
This commit is contained in:
Max Kellermann 2018-07-21 07:36:42 +02:00
parent 821f77325c
commit b34fd905c8
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/SongFilter.cxx
View File

@ -216,11 +216,17 @@ SongFilter::Parse(const char *tag_string, const char *value, bool fold_case)
void
SongFilter::Parse(ConstBuffer<const char *> args, bool fold_case)
{
if (args.size == 0 || args.size % 2 != 0)
if (args.empty())
throw std::runtime_error("Incorrect number of filter arguments");
for (unsigned i = 0; i < args.size; i += 2)
Parse(args[i], args[i + 1], fold_case);
do {
if (args.size < 2)
throw std::runtime_error("Incorrect number of filter arguments");
const char *tag = args.shift();
const char *value = args.shift();
Parse(tag, value, fold_case);
} while (!args.empty());
}
bool