From b8ed4200586db697edd051c7fc21b78c92d4255b Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 14 Feb 2012 18:46:30 +0100
Subject: command: move functions to protocol/result.c
---
Makefile.am | 1 +
src/command.c | 32 +----------------------------
src/protocol/result.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++
src/protocol/result.h | 44 +++++++++++++++++++++++++++++++++++++++
4 files changed, 103 insertions(+), 31 deletions(-)
create mode 100644 src/protocol/result.c
create mode 100644 src/protocol/result.h
diff --git a/Makefile.am b/Makefile.am
index e113e8b61..915aa18cb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 \
diff --git a/src/command.c b/src/command.c
index 2f2159e87..85d034da0 100644
--- a/src/command.c
+++ b/src/command.c
@@ -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, ...)
diff --git a/src/protocol/result.c b/src/protocol/result.c
new file mode 100644
index 000000000..30cd0a266
--- /dev/null
+++ b/src/protocol/result.c
@@ -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);
+}
diff --git a/src/protocol/result.h b/src/protocol/result.h
new file mode 100644
index 000000000..8b9e44bfd
--- /dev/null
+++ b/src/protocol/result.h
@@ -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
--
cgit v1.2.3