protocol/Result: move error code to class Response

3 files changed, 7 insertions, 39 deletions

diff --git a/src/client/Response.cxx b/src/client/Response.cxx
index 9beaab156..c7b25e84c 100644
--- a/src/client/Response.cxx
+++ b/src/client/Response.cxx
@@ -59,14 +59,19 @@ Response::Format(const char *fmt, ...)
 void
 Response::Error(enum ack code, const char *msg)
 {
-	command_error(client, code, "%s", msg);
+	FormatError(code, "%s", msg);
 }
 
 void
 Response::FormatError(enum ack code, const char *fmt, ...)
 {
+	Format("ACK [%i@%i] {%s} ",
+	       (int)code, command_list_num, current_command);
+
 	va_list args;
 	va_start(args, fmt);
-	command_error_v(client, code, fmt, args);
+	FormatV(fmt, args);
 	va_end(args);
+
+	Write("\n");
 }
diff --git a/src/protocol/Result.cxx b/src/protocol/Result.cxx
index 66ea185cb..a8a1c2d46 100644
--- a/src/protocol/Result.cxx
+++ b/src/protocol/Result.cxx
@@ -21,8 +21,6 @@
 #include "Result.hxx"
 #include "client/Client.hxx"
 
-#include <assert.h>
-
 const char *current_command;
 int command_list_num;
 
@@ -31,26 +29,3 @@ 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 2ec861468..f45e91190 100644
--- a/src/protocol/Result.hxx
+++ b/src/protocol/Result.hxx
@@ -21,10 +21,6 @@
 #define MPD_PROTOCOL_RESULT_HXX
 
 #include "check.h"
-#include "Compiler.h"
-#include "Ack.hxx"
-
-#include <stdarg.h>
 
 class Client;
 
@@ -34,12 +30,4 @@ 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