command: move code to protocol/argparser.c

1 files changed, 1 insertions, 166 deletions

diff --git a/src/command.c b/src/command.c
index ea6348953..2d6966509 100644
--- a/src/command.c
+++ b/src/command.c
@@ -19,6 +19,7 @@
 
 #include "config.h"
 #include "command.h"
+#include "protocol/argparser.h"
 #include "protocol/result.h"
 #include "player_control.h"
 #include "playlist.h"
@@ -107,172 +108,6 @@ struct command {
 	enum command_return (*handler)(struct client *client, int argc, char **argv);
 };
 
-static bool
-check_uint32(struct client *client, uint32_t *dst, const char *s)
-{
-	char *test;
-
-	*dst = strtoul(s, &test, 10);
-	if (test == s || *test != '\0') {
-		command_error(client, ACK_ERROR_ARG,
-			      "Integer expected: %s", s);
-		return false;
-	}
-	return true;
-}
-
-static bool
-check_int(struct client *client, int *value_r, const char *s)
-{
-	char *test;
-	long value;
-
-	value = strtol(s, &test, 10);
-	if (test == s || *test != '\0') {
-		command_error(client, ACK_ERROR_ARG,
-			      "Integer expected: %s", s);
-		return false;
-	}
-
-#if G_MAXLONG > G_MAXINT
-	if (value < G_MININT || value > G_MAXINT) {
-		command_error(client, ACK_ERROR_ARG,
-			      "Number too large: %s", s);
-		return false;
-	}
-#endif
-
-	*value_r = (int)value;
-	return true;
-}
-
-static bool
-check_range(struct client *client, unsigned *value_r1, unsigned *value_r2,
-	    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,
-			      "Integer or range expected: %s", s);
-		return false;
-	}
-
-	if (value == -1 && *test == 0) {
-		/* compatibility with older MPD versions: specifying
-		   "-1" makes MPD display the whole list */
-		*value_r1 = 0;
-		*value_r2 = G_MAXUINT;
-		return true;
-	}
-
-	if (value < 0) {
-		command_error(client, ACK_ERROR_ARG,
-			      "Number is negative: %s", s);
-		return false;
-	}
-
-#if G_MAXLONG > G_MAXUINT
-	if (value > G_MAXUINT) {
-		command_error(client, ACK_ERROR_ARG,
-			      "Number too large: %s", s);
-		return false;
-	}
-#endif
-
-	*value_r1 = (unsigned)value;
-
-	if (*test == ':') {
-		value = strtol(++test, &test2, 10);
-		if (test2 == test || *test2 != '\0') {
-			command_error(client, ACK_ERROR_ARG,
-				      "Integer or range expected: %s", s);
-			return false;
-		}
-
-		if (test == test2)
-			value = G_MAXUINT;
-
-		if (value < 0) {
-			command_error(client, ACK_ERROR_ARG,
-				      "Number is negative: %s", s);
-			return false;
-		}
-
-#if G_MAXLONG > G_MAXUINT
-		if (value > G_MAXUINT) {
-			command_error(client, ACK_ERROR_ARG,
-				      "Number too large: %s", s);
-			return false;
-		}
-#endif
-		*value_r2 = (unsigned)value;
-	} else {
-		*value_r2 = (unsigned)value + 1;
-	}
-
-	return true;
-}
-
-static bool
-check_unsigned(struct client *client, unsigned *value_r, const char *s)
-{
-	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);
-		return false;
-	}
-
-	if (value > G_MAXUINT) {
-		command_error(client, ACK_ERROR_ARG,
-			      "Number too large: %s", s);
-		return false;
-	}
-
-	*value_r = (unsigned)value;
-	return true;
-}
-
-static bool
-check_bool(struct client *client, 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,
-			      "Boolean (0/1) expected: %s", s);
-		return false;
-	}
-
-	*value_r = !!value;
-	return true;
-}
-
-static bool
-check_float(struct client *client, 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);
-		return false;
-	}
-
-	*value_r = value;
-	return true;
-}
-
 static enum command_return
 print_playlist_result(struct client *client,
 		      enum playlist_result result)