aboutsummaryrefslogtreecommitdiffstats
path: root/src/protocol/ArgParser.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'src/protocol/ArgParser.cxx')
-rw-r--r--src/protocol/ArgParser.cxx102
1 files changed, 54 insertions, 48 deletions
diff --git a/src/protocol/ArgParser.cxx b/src/protocol/ArgParser.cxx
index e373827b4..31756f53e 100644
--- a/src/protocol/ArgParser.cxx
+++ b/src/protocol/ArgParser.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright (C) 2003-2015 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@@ -19,61 +19,63 @@
#include "config.h"
#include "ArgParser.hxx"
-#include "Result.hxx"
#include "Chrono.hxx"
-
-#include <limits>
+#include "client/Response.hxx"
#include <stdlib.h>
bool
-check_uint32(Client &client, uint32_t *dst, const char *s)
+ParseCommandArg32(Response &r, uint32_t &value_r, const char *s)
{
char *test;
- *dst = strtoul(s, &test, 10);
+ value_r = strtoul(s, &test, 10);
if (test == s || *test != '\0') {
- command_error(client, ACK_ERROR_ARG,
- "Integer expected: %s", s);
+ r.FormatError(ACK_ERROR_ARG, "Integer expected: %s", s);
return false;
}
return true;
}
bool
-check_int(Client &client, int *value_r, const char *s)
+ParseCommandArg(Response &r, int &value_r, const char *s,
+ int min_value, int max_value)
{
char *test;
long value;
value = strtol(s, &test, 10);
if (test == s || *test != '\0') {
- command_error(client, ACK_ERROR_ARG,
- "Integer expected: %s", s);
+ r.FormatError(ACK_ERROR_ARG, "Integer expected: %s", s);
return false;
}
- if (value < std::numeric_limits<int>::min() ||
- value > std::numeric_limits<int>::max()) {
- command_error(client, ACK_ERROR_ARG,
- "Number too large: %s", s);
+ if (value < min_value || value > max_value) {
+ r.FormatError(ACK_ERROR_ARG, "Number too large: %s", s);
return false;
}
- *value_r = (int)value;
+ value_r = (int)value;
return true;
}
bool
-check_range(Client &client, unsigned *value_r1, unsigned *value_r2,
- const char *s)
+ParseCommandArg(Response &r, int &value_r, const char *s)
+{
+ return ParseCommandArg(r, value_r, s,
+ std::numeric_limits<int>::min(),
+ std::numeric_limits<int>::max());
+}
+
+bool
+ParseCommandArg(Response &r, RangeArg &value_r, const char *s)
{
char *test, *test2;
long value;
value = strtol(s, &test, 10);
if (test == s || (*test != '\0' && *test != ':')) {
- command_error(client, ACK_ERROR_ARG,
+ r.FormatError(ACK_ERROR_ARG,
"Integer or range expected: %s", s);
return false;
}
@@ -81,29 +83,27 @@ check_range(Client &client, unsigned *value_r1, unsigned *value_r2,
if (value == -1 && *test == 0) {
/* compatibility with older MPD versions: specifying
"-1" makes MPD display the whole list */
- *value_r1 = 0;
- *value_r2 = std::numeric_limits<int>::max();
+ value_r.start = 0;
+ value_r.end = std::numeric_limits<int>::max();
return true;
}
if (value < 0) {
- command_error(client, ACK_ERROR_ARG,
- "Number is negative: %s", s);
+ r.FormatError(ACK_ERROR_ARG, "Number is negative: %s", s);
return false;
}
if (unsigned(value) > std::numeric_limits<unsigned>::max()) {
- command_error(client, ACK_ERROR_ARG,
- "Number too large: %s", s);
+ r.FormatError(ACK_ERROR_ARG, "Number too large: %s", s);
return false;
}
- *value_r1 = (unsigned)value;
+ value_r.start = (unsigned)value;
if (*test == ':') {
value = strtol(++test, &test2, 10);
if (*test2 != '\0') {
- command_error(client, ACK_ERROR_ARG,
+ r.FormatError(ACK_ERROR_ARG,
"Integer or range expected: %s", s);
return false;
}
@@ -112,87 +112,93 @@ check_range(Client &client, unsigned *value_r1, unsigned *value_r2,
value = std::numeric_limits<int>::max();
if (value < 0) {
- command_error(client, ACK_ERROR_ARG,
+ r.FormatError(ACK_ERROR_ARG,
"Number is negative: %s", s);
return false;
}
if (unsigned(value) > std::numeric_limits<unsigned>::max()) {
- command_error(client, ACK_ERROR_ARG,
+ r.FormatError(ACK_ERROR_ARG,
"Number too large: %s", s);
return false;
}
- *value_r2 = (unsigned)value;
+ value_r.end = (unsigned)value;
} else {
- *value_r2 = (unsigned)value + 1;
+ value_r.end = (unsigned)value + 1;
}
return true;
}
bool
-check_unsigned(Client &client, unsigned *value_r, const char *s)
+ParseCommandArg(Response &r, unsigned &value_r, const char *s,
+ unsigned max_value)
{
unsigned long value;
char *endptr;
value = strtoul(s, &endptr, 10);
if (endptr == s || *endptr != 0) {
- command_error(client, ACK_ERROR_ARG,
- "Integer expected: %s", s);
+ r.FormatError(ACK_ERROR_ARG, "Integer expected: %s", s);
return false;
}
- if (value > std::numeric_limits<unsigned>::max()) {
- command_error(client, ACK_ERROR_ARG,
+ if (value > max_value) {
+ r.FormatError(ACK_ERROR_ARG,
"Number too large: %s", s);
return false;
}
- *value_r = (unsigned)value;
+ value_r = (unsigned)value;
return true;
}
bool
-check_bool(Client &client, bool *value_r, const char *s)
+ParseCommandArg(Response &r, unsigned &value_r, const char *s)
+{
+ return ParseCommandArg(r, value_r, s,
+ std::numeric_limits<unsigned>::max());
+}
+
+bool
+ParseCommandArg(Response &r, bool &value_r, const char *s)
{
long value;
char *endptr;
value = strtol(s, &endptr, 10);
if (endptr == s || *endptr != 0 || (value != 0 && value != 1)) {
- command_error(client, ACK_ERROR_ARG,
+ r.FormatError(ACK_ERROR_ARG,
"Boolean (0/1) expected: %s", s);
return false;
}
- *value_r = !!value;
+ value_r = !!value;
return true;
}
bool
-check_float(Client &client, float *value_r, const char *s)
+ParseCommandArg(Response &r, float &value_r, const char *s)
{
float value;
char *endptr;
value = strtof(s, &endptr);
if (endptr == s || *endptr != 0) {
- command_error(client, ACK_ERROR_ARG,
- "Float expected: %s", s);
+ r.FormatError(ACK_ERROR_ARG, "Float expected: %s", s);
return false;
}
- *value_r = value;
+ value_r = value;
return true;
}
bool
-ParseCommandArg(Client &client, SongTime &value_r, const char *s)
+ParseCommandArg(Response &r, SongTime &value_r, const char *s)
{
float value;
- bool success = check_float(client, &value, s) && value >= 0;
+ bool success = ParseCommandArg(r, value, s) && value >= 0;
if (success)
value_r = SongTime::FromS(value);
@@ -200,10 +206,10 @@ ParseCommandArg(Client &client, SongTime &value_r, const char *s)
}
bool
-ParseCommandArg(Client &client, SignedSongTime &value_r, const char *s)
+ParseCommandArg(Response &r, SignedSongTime &value_r, const char *s)
{
float value;
- bool success = check_float(client, &value, s);
+ bool success = ParseCommandArg(r, value, s);
if (success)
value_r = SignedSongTime::FromS(value);
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-04 04:59:10 +0000