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

protocol/ArgParser: add overload with max_value parameter

Browse Source
This commit is contained in:
Max Kellermann
2015-08-11 22:57:06 +02:00
parent ee61dfe087
commit e118e958f7
4 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/protocol/ArgParser.cxx
View File

@@ -39,7 +39,8 @@ check_uint32(Client &client, uint32_t *dst, const char *s)
}
bool
ParseCommandArg(Client &client, int &value_r, const char *s)
ParseCommandArg(Client &client, int &value_r, const char *s,
int min_value, int max_value)
{
char *test;
long value;
@@ -51,8 +52,7 @@ ParseCommandArg(Client &client, int &value_r, const char *s)
return false;
}
if (value < std::numeric_limits<int>::min() ||
value > std::numeric_limits<int>::max()) {
if (value < min_value || value > max_value) {
command_error(client, ACK_ERROR_ARG,
"Number too large: %s", s);
return false;
@@ -62,6 +62,14 @@ ParseCommandArg(Client &client, int &value_r, const char *s)
return true;
}
bool
ParseCommandArg(Client &client, int &value_r, const char *s)
{
return ParseCommandArg(client, value_r, s,
std::numeric_limits<int>::min(),
std::numeric_limits<int>::max());
}
bool
ParseCommandArg(Client &client, RangeArg &value_r, const char *s)
{
@@ -129,7 +137,8 @@ ParseCommandArg(Client &client, RangeArg &value_r, const char *s)
}
bool
ParseCommandArg(Client &client, unsigned &value_r, const char *s)
ParseCommandArg(Client &client, unsigned &value_r, const char *s,
unsigned max_value)
{
unsigned long value;
char *endptr;
@@ -141,7 +150,7 @@ ParseCommandArg(Client &client, unsigned &value_r, const char *s)
return false;
}
if (value > std::numeric_limits<unsigned>::max()) {
if (value > max_value) {
command_error(client, ACK_ERROR_ARG,
"Number too large: %s", s);
return false;
@@ -151,6 +160,13 @@ ParseCommandArg(Client &client, unsigned &value_r, const char *s)
return true;
}
bool
ParseCommandArg(Client &client, unsigned &value_r, const char *s)
{
return ParseCommandArg(client, value_r, s,
std::numeric_limits<unsigned>::max());
}
bool
ParseCommandArg(Client &client, bool &value_r, const char *s)
{