Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

status: moved connection specific code to cstatus.c

    
Make status.c without internal.h.
  • Loading branch information...
commit fd3ee4406a5a456e9ecc21adc7f06dcbd97340a8 1 parent 3c0d900
Max Kellermann MaxKellermann authored
Showing with 66 additions and 32 deletions.
  1. +1 −0  Makefile.am
  2. +65 −0 src/cstatus.c
  3. +0 −32 src/status.c
1  Makefile.am
View
@@ -59,6 +59,7 @@ src_libmpdclient_la_SOURCES = \
src/socket.c src/socket.h \
src/song.c \
src/status.c \
+ src/cstatus.c \
src/stats.c \
src/cstats.c \
src/stored_playlist.c \
65 src/cstatus.c
View
@@ -0,0 +1,65 @@
+/* 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/status.h.
+ *
+ */
+
+#include <mpd/status.h>
+#include <mpd/send.h>
+#include <mpd/recv.h>
+#include "internal.h"
+
+struct mpd_status *
+mpd_recv_status(struct mpd_connection * connection)
+{
+ struct mpd_status * status;
+ struct mpd_pair *pair;
+
+ if (mpd_error_is_defined(&connection->error))
+ return NULL;
+
+ status = mpd_status_new();
+ if (status == NULL) {
+ mpd_error_code(&connection->error, MPD_ERROR_OOM);
+ return NULL;
+ }
+
+ while ((pair = mpd_recv_pair(connection)) != NULL) {
+ mpd_status_feed(status, pair);
+ mpd_return_pair(connection, pair);
+ }
+
+ if (mpd_error_is_defined(&connection->error)) {
+ mpd_status_free(status);
+ return NULL;
+ }
+
+ return status;
+}
32 src/status.c
View
@@ -32,10 +32,6 @@
#include <mpd/status.h>
#include <mpd/pair.h>
-#include <mpd/send.h>
-#include <mpd/connection.h>
-#include <mpd/recv.h>
-#include "internal.h"
#include <stdlib.h>
#include <string.h>
@@ -207,34 +203,6 @@ mpd_status_feed(struct mpd_status *status, const struct mpd_pair *pair)
}
-struct mpd_status *
-mpd_recv_status(struct mpd_connection * connection)
-{
- struct mpd_status * status;
- struct mpd_pair *pair;
-
- if (mpd_error_is_defined(&connection->error))
- return NULL;
-
- status = mpd_status_new();
- if (status == NULL) {
- mpd_error_code(&connection->error, MPD_ERROR_OOM);
- return NULL;
- }
-
- while ((pair = mpd_recv_pair(connection)) != NULL) {
- mpd_status_feed(status, pair);
- mpd_return_pair(connection, pair);
- }
-
- if (mpd_error_is_defined(&connection->error)) {
- mpd_status_free(status);
- return NULL;
- }
-
- return status;
-}
-
void mpd_status_free(struct mpd_status * status) {
if (status->error) free(status->error);
free(status);
Please sign in to comment.
Something went wrong with that request. Please try again.