Permalink
Browse files

moved "enum mpd_error" to error.h

The new public header file "error.h" should provide everything about
error handling.
  • Loading branch information...
1 parent e652fff commit 45c1e46b92e85a835cdbc1cac561f0707382a79b @MaxKellermann MaxKellermann committed Dec 3, 2008
Showing with 69 additions and 35 deletions.
  1. +1 −0 Makefile.am
  2. +1 −35 include/mpd/connection.h
  3. +67 −0 include/mpd/error.h
View
1 Makefile.am
@@ -9,6 +9,7 @@ mpdinclude_HEADERS = \
include/mpd/connection.h \
include/mpd/directory.h \
include/mpd/entity.h \
+ include/mpd/error.h \
include/mpd/idle.h \
include/mpd/protocol.h \
include/mpd/status.h \
View
36 include/mpd/connection.h
@@ -34,45 +34,11 @@
#define MPD_CONNECTION_H
#include <mpd/protocol.h>
+#include <mpd/error.h>
#include <mpd/return_element.h>
#include <stdlib.h>
-enum mpd_error {
- /** no error */
- MPD_ERROR_SUCCESS = 0,
-
- /** timeout trying to talk to mpd */
- MPD_ERROR_TIMEOUT = 10,
-
- /** system error */
- MPD_ERROR_SYSTEM,
-
- /** unknown host */
- MPD_ERROR_UNKHOST,
-
- /** problems connecting to port on host */
- MPD_ERROR_CONNPORT,
-
- /** mpd not running on port at host */
- MPD_ERROR_NOTMPD,
-
- /** no response on attempting to connect */
- MPD_ERROR_NORESPONSE,
-
- /** error sending command */
- MPD_ERROR_SENDING,
-
- /** connection closed by mpd */
- MPD_ERROR_CONNCLOSED,
-
- /** ACK returned! */
- MPD_ERROR_ACK,
-
- /** Buffer was overrun! */
- MPD_ERROR_BUFFEROVERRUN,
-};
-
/* mpd_Connection
* holds info about connection to mpd
* use error, and errorStr to detect errors
View
67 include/mpd/error.h
@@ -0,0 +1,67 @@
+/* libmpdclient
+ (c) 2003-2008 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.
+*/
+
+#ifndef MPD_ERROR_H
+#define MPD_ERROR_H
+
+enum mpd_error {
+ /** no error */
+ MPD_ERROR_SUCCESS = 0,
+
+ /** timeout trying to talk to mpd */
+ MPD_ERROR_TIMEOUT = 10,
+
+ /** system error */
+ MPD_ERROR_SYSTEM,
+
+ /** unknown host */
+ MPD_ERROR_UNKHOST,
+
+ /** problems connecting to port on host */
+ MPD_ERROR_CONNPORT,
+
+ /** mpd not running on port at host */
+ MPD_ERROR_NOTMPD,
+
+ /** no response on attempting to connect */
+ MPD_ERROR_NORESPONSE,
+
+ /** error sending command */
+ MPD_ERROR_SENDING,
+
+ /** connection closed by mpd */
+ MPD_ERROR_CONNCLOSED,
+
+ /** ACK returned! */
+ MPD_ERROR_ACK,
+
+ /** Buffer was overrun! */
+ MPD_ERROR_BUFFEROVERRUN,
+};
+
+#endif

0 comments on commit 45c1e46

Please sign in to comment.