aboutsummaryrefslogtreecommitdiffstats
path: root/src/protocol
diff options
context:
space:
mode:
Diffstat (limited to 'src/protocol')
-rw-r--r--src/protocol/Ack.cxx2
-rw-r--r--src/protocol/Ack.hxx2
-rw-r--r--src/protocol/ArgParser.cxx102
-rw-r--r--src/protocol/ArgParser.hxx44
-rw-r--r--src/protocol/Result.cxx30
-rw-r--r--src/protocol/Result.hxx17
6 files changed, 91 insertions, 106 deletions
diff --git a/src/protocol/Ack.cxx b/src/protocol/Ack.cxx
index 56f0f0b5d..9e0c06614 100644
--- a/src/protocol/Ack.cxx
+++ b/src/protocol/Ack.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
diff --git a/src/protocol/Ack.hxx b/src/protocol/Ack.hxx
index e2c4dd9d1..c8457c5b4 100644
--- a/src/protocol/Ack.hxx
+++ b/src/protocol/Ack.hxx
@@ -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
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);
diff --git a/src/protocol/ArgParser.hxx b/src/protocol/ArgParser.hxx
index 0f79e7ab2..f60dbdf50 100644
--- a/src/protocol/ArgParser.hxx
+++ b/src/protocol/ArgParser.hxx
@@ -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
@@ -22,35 +22,57 @@
#include "check.h"
+#include <limits>
+
#include <stdint.h>
-class Client;
+class Response;
class SongTime;
class SignedSongTime;
bool
-check_uint32(Client &client, uint32_t *dst, const char *s);
+ParseCommandArg32(Response &r, uint32_t &value_r, const char *s);
+
+bool
+ParseCommandArg(Response &r, int &value_r, const char *s,
+ int min_value, int max_value);
+
+bool
+ParseCommandArg(Response &r, int &value_r, const char *s);
+
+struct RangeArg {
+ unsigned start, end;
+
+ void SetAll() {
+ start = 0;
+ end = std::numeric_limits<unsigned>::max();
+ }
+
+ static constexpr RangeArg All() {
+ return { 0, std::numeric_limits<unsigned>::max() };
+ }
+};
bool
-check_int(Client &client, int *value_r, const char *s);
+ParseCommandArg(Response &r, RangeArg &value_r, const char *s);
bool
-check_range(Client &client, unsigned *value_r1, unsigned *value_r2,
- const char *s);
+ParseCommandArg(Response &r, unsigned &value_r, const char *s,
+ unsigned max_value);
bool
-check_unsigned(Client &client, unsigned *value_r, const char *s);
+ParseCommandArg(Response &r, unsigned &value_r, const char *s);
bool
-check_bool(Client &client, bool *value_r, const char *s);
+ParseCommandArg(Response &r, bool &value_r, const char *s);
bool
-check_float(Client &client, float *value_r, const char *s);
+ParseCommandArg(Response &r, float &value_r, const char *s);
bool
-ParseCommandArg(Client &client, SongTime &value_r, const char *s);
+ParseCommandArg(Response &r, 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);
#endif
diff --git a/src/protocol/Result.cxx b/src/protocol/Result.cxx
index 3cc5fc33e..6a0da1665 100644
--- a/src/protocol/Result.cxx
+++ b/src/protocol/Result.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
@@ -21,36 +21,8 @@
#include "Result.hxx"
#include "client/Client.hxx"
-#include <assert.h>
-
-const char *current_command;
-int command_list_num;
-
void
command_success(Client &client)
{
client_puts(client, "OK\n");
}
-
-void
-command_error_v(Client &client, enum ack error,
- const char *fmt, va_list args)
-{
- assert(current_command != nullptr);
-
- client_printf(client, "ACK [%i@%i] {%s} ",
- (int)error, command_list_num, current_command);
- client_vprintf(client, fmt, args);
- client_puts(client, "\n");
-
- current_command = nullptr;
-}
-
-void
-command_error(Client &client, enum ack error, const char *fmt, ...)
-{
- va_list args;
- va_start(args, fmt);
- command_error_v(client, error, fmt, args);
- va_end(args);
-}
diff --git a/src/protocol/Result.hxx b/src/protocol/Result.hxx
index 0ac9d1e6b..d75bbe51b 100644
--- a/src/protocol/Result.hxx
+++ b/src/protocol/Result.hxx
@@ -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
@@ -21,25 +21,10 @@
#define MPD_PROTOCOL_RESULT_HXX
#include "check.h"
-#include "Compiler.h"
-#include "Ack.hxx"
-
-#include <stdarg.h>
class Client;
-extern const char *current_command;
-extern int command_list_num;
-
void
command_success(Client &client);
-void
-command_error_v(Client &client, enum ack error,
- const char *fmt, va_list args);
-
-gcc_printf(3,4)
-void
-command_error(Client &client, enum ack error, const char *fmt, ...);
-
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-17 08:06:35 +0000