Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

stats: moved connection specific code to cstats.c

Make stats.c without internal.h.
  • Loading branch information...
commit 3c0d9004bcc62cc6e80dac227f197bc100ffcf1a 1 parent 9ab4ef9
@MaxKellermann MaxKellermann authored
Showing with 90 additions and 52 deletions.
  1. +1 −0  Makefile.am
  2. +88 −0 src/cstats.c
  3. +1 −52 src/stats.c
View
1  Makefile.am
@@ -60,6 +60,7 @@ src_libmpdclient_la_SOURCES = \
src/song.c \
src/status.c \
src/stats.c \
+ src/cstats.c \
src/stored_playlist.c \
src/sync.c src/sync.h \
src/tag.c
View
88 src/cstats.c
@@ -0,0 +1,88 @@
+/* libmpdclient
+ (c) 2003-2009 The Music Player Daemon Project
+ This project's homepage is: http://www.musicpd.org
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/*
+ * mpd_connection specific functions declared in mpd/stats.h.
+ *
+ */
+
+#include <mpd/stats.h>
+#include <mpd/send.h>
+#include <mpd/recv.h>
+#include "internal.h"
+
+#include <assert.h>
+
+bool
+mpd_send_stats(struct mpd_connection *connection)
+{
+ return mpd_send_command(connection, "stats", NULL);
+}
+
+struct mpd_stats *
+mpd_recv_stats(struct mpd_connection *connection)
+{
+ struct mpd_stats * stats;
+ struct mpd_pair *pair;
+
+ assert(connection != NULL);
+
+ if (mpd_error_is_defined(&connection->error))
+ /* refuse to receive a response if the connection's
+ state is not clean */
+ return NULL;
+
+ stats = mpd_stats_new();
+ if (stats == NULL) {
+ mpd_error_code(&connection->error, MPD_ERROR_OOM);
+ return NULL;
+ }
+
+ /* read and parse all response lines */
+ while ((pair = mpd_recv_pair(connection)) != NULL) {
+ mpd_stats_feed(stats, pair);
+ mpd_return_pair(connection, pair);
+ }
+
+ if (mpd_error_is_defined(&connection->error)) {
+ /* an error has occured; roll back */
+ mpd_stats_free(stats);
+ return NULL;
+ }
+
+ return stats;
+}
+
+
+struct mpd_stats *
+mpd_get_stats(struct mpd_connection * connection)
+{
+ return mpd_send_stats(connection)
+ ? mpd_recv_stats(connection)
+ : NULL;
+}
View
53 src/stats.c
@@ -32,10 +32,8 @@
#include <mpd/stats.h>
#include <mpd/pair.h>
-#include <mpd/send.h>
-#include <mpd/recv.h>
-#include "internal.h"
+#include <assert.h>
#include <stdlib.h>
#include <string.h>
@@ -49,12 +47,6 @@ struct mpd_stats {
unsigned long db_play_time;
};
-bool
-mpd_send_stats(struct mpd_connection *connection)
-{
- return mpd_send_command(connection, "stats", NULL);
-}
-
struct mpd_stats *
mpd_stats_new(void)
{
@@ -92,49 +84,6 @@ mpd_stats_feed(struct mpd_stats *stats, const struct mpd_pair *pair)
stats->db_play_time = strtol(pair->value,NULL,10);
}
-struct mpd_stats *
-mpd_recv_stats(struct mpd_connection *connection)
-{
- struct mpd_stats * stats;
- struct mpd_pair *pair;
-
- assert(connection != NULL);
-
- if (mpd_error_is_defined(&connection->error))
- /* refuse to receive a response if the connection's
- state is not clean */
- return NULL;
-
- stats = mpd_stats_new();
- if (stats == NULL) {
- mpd_error_code(&connection->error, MPD_ERROR_OOM);
- return NULL;
- }
-
- /* read and parse all response lines */
- while ((pair = mpd_recv_pair(connection)) != NULL) {
- mpd_stats_feed(stats, pair);
- mpd_return_pair(connection, pair);
- }
-
- if (mpd_error_is_defined(&connection->error)) {
- /* an error has occured; roll back */
- mpd_stats_free(stats);
- return NULL;
- }
-
- return stats;
-}
-
-
-struct mpd_stats *
-mpd_get_stats(struct mpd_connection * connection)
-{
- return mpd_send_stats(connection)
- ? mpd_recv_stats(connection)
- : NULL;
-}
-
void mpd_stats_free(struct mpd_stats * stats) {
assert(stats != NULL);

0 comments on commit 3c0d900

Please sign in to comment.
Something went wrong with that request. Please try again.