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

command: move functions to protocol/result.c

Browse Source
This commit is contained in:
Max Kellermann 2012-02-14 18:46:30 +01:00
parent ed16ee3029
commit b8ed420058
4 changed files with 103 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -233,6 +233,7 @@ src_mpd_SOURCES = \
src/audio_check.c \
src/audio_format.c \
src/audio_parser.c \
src/protocol/result.c src/protocol/result.h \
src/command.c \
src/idle.c \
src/cmdline.c \

32
src/command.c
View File

@ -19,6 +19,7 @@
#include "config.h"
#include "command.h"
#include "protocol/result.h"
#include "player_control.h"
#include "playlist.h"
#include "playlist_print.h"
@ -114,37 +115,6 @@ static const char need_range[] = "need a range";
static const char check_integer[] = "\"%s\" is not a integer";
static const char need_integer[] = "need an integer";
static const char *current_command;
static int command_list_num;
void command_success(struct client *client)
{
client_puts(client, "OK\n");
}
static void command_error_v(struct client *client, enum ack error,
const char *fmt, va_list args)
{
assert(client != NULL);
assert(current_command != NULL);
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 = NULL;
}
G_GNUC_PRINTF(3, 4) static void command_error(struct 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);
}
static bool G_GNUC_PRINTF(4, 5)
check_uint32(struct client *client, uint32_t *dst,
const char *s, const char *fmt, ...)

57
src/protocol/result.c Normal file
View File

@ -0,0 +1,57 @@
/*
* Copyright (C) 2003-2012 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
#include "result.h"
#include "client.h"
#include <assert.h>
const char *current_command;
int command_list_num;
void
command_success(struct client *client)
{
client_puts(client, "OK\n");
}
void
command_error_v(struct client *client, enum ack error,
const char *fmt, va_list args)
{
assert(client != NULL);
assert(current_command != NULL);
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 = NULL;
}
void
command_error(struct 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);
}

44
src/protocol/result.h Normal file
View File

@ -0,0 +1,44 @@
/*
* Copyright (C) 2003-2012 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPD_PROTOCOL_RESULT_H
#define MPD_PROTOCOL_RESULT_H
#include "check.h"
#include "ack.h"
#include <glib.h>
struct client;
extern const char *current_command;
extern int command_list_num;
void
command_success(struct client *client);
void
command_error_v(struct client *client, enum ack error,
const char *fmt, va_list args);
G_GNUC_PRINTF(3, 4)
void
command_error(struct client *client, enum ack error, const char *fmt, ...);
#endif