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

command: added command_success() and command_error() 

These two functions take a client struct instead of the file
descriptor.  We will now begin passing the client struct around
instead of a raw file descriptor (which needed a linear lookup in the
client list to be useful).
This commit is contained in:
Max Kellermann 2008-09-07 13:51:59 +02:00
parent 4ddc0a48e2
commit 54371add13
3 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client.c
View File

@ -348,7 +348,7 @@ static int client_process_line(struct client *client)
}
if (ret == 0)
commandSuccess(client->fd);
command_success(client);
client_write_output(client);
free_cmd_list(client->cmd_list);
@ -394,7 +394,7 @@ static int client_process_line(struct client *client)
}
if (ret == 0)
commandSuccess(client->fd);
command_success(client);
client_write_output(client);
}

28
src/command.c
View File

@ -186,6 +186,34 @@ static void command_error_va(int fd, int error, const char *fmt, va_list args)
}
}
void command_success(struct client *client)
{
client_puts(client, "OK\n");
}
static void command_error_v(struct client *client, int error,
const char *fmt, va_list args)
{
assert(client != NULL);
assert(current_command != NULL);
client_printf(client, "ACK [%i@%i] {%s} ",
(int)error, command_listNum, current_command);
client_vprintf(client, fmt, args);
client_puts(client, "\n");
current_command = NULL;
}
mpd_fprintf_ void command_error(struct client *client, int error,
const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
command_error_v(client, error, fmt, args);
va_end(args);
}
static int mpd_fprintf__ check_uint32(int fd, mpd_uint32 *dst,
const char *s, const char *fmt, ...)
{

8
src/command.h
View File

@ -22,7 +22,6 @@
#include "gcc.h"
#include "os_compat.h"
#include "sllist.h"
#include "myfprintf.h"
#define COMMAND_RETURN_KILL 10
#define COMMAND_RETURN_CLOSE 20
@ -40,8 +39,11 @@ void initCommands(void);
void finishCommands(void);
#define commandSuccess(fd) fdprintf(fd, "OK\n")
mpd_fprintf_ void commandError(int fd, int error, const char *fmt, ...);
void command_success(struct client *client);
mpd_fprintf_ void command_error(struct client *client, int error,
const char *fmt, ...);
#endif