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

protocol/Result: move error code to class Response

Browse Source
This commit is contained in:
Max Kellermann 2015-08-14 18:57:44 +02:00
parent 86e036c393
commit c8d0f947d2
3 changed files with 7 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/client/Response.cxx
View File

@ -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");
}

25
src/protocol/Result.cxx
View File

@ -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);
}

12
src/protocol/Result.hxx
View File

@ -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