X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=d62781c449b53f09bc628aee0101e3b9d635847a;hp=bc8475e0c2fcb77ce99b9d91f74d42b1e0e97313;hb=c430e588047c5db3eb0d043c4dd1378680ec2bcf;hpb=2ed89c59f0efcd0a2763f47c7d3455663241e623

diff --git a/error.h b/error.h
index bc8475e0..d62781c4 100644
--- a/error.h
+++ b/error.h
@@ -19,12 +19,47 @@
 /** \file error.h list of error messages for all subsystems */
 
 /** \cond list of all subsystems that support the shiny new error facility */
-enum para_subsystem {SS_RECV,
-	SS_NET, SS_ORTP_RECV, SS_AUDIOD, SS_EXEC, SS_CLOSE_ON_FORK, SS_SIGNAL,
-	SS_STRING, SS_DAEMON, SS_STAT, SS_TIME, SS_GRAB_CLIENT, SS_HTTP_RECV,
-	SS_RECV_COMMON, SS_FILTER_CHAIN, SS_WAV, SS_COMPRESS, SS_OGGDEC, SS_FILTER,
-	SS_COMMAND, SS_DOPEY, SS_CRYPT, SS_HTTP_SEND, SS_ORTP_SEND, SS_DB, SS_OGG,
-	SS_MP3, SS_MP3DEC, SS_SERVER, SS_AFS, SS_MYSQL, SS_RINGBUFFER};
+enum para_subsystem {
+	SS_RECV,
+	SS_NET,
+	SS_ORTP_RECV,
+	SS_AUDIOD,
+	SS_EXEC,
+	SS_CLOSE_ON_FORK,
+	SS_SIGNAL,
+	SS_STRING,
+	SS_DAEMON,
+	SS_STAT,
+	SS_TIME,
+	SS_GRAB_CLIENT,
+	SS_HTTP_RECV,
+	SS_RECV_COMMON,
+	SS_FILTER_CHAIN,
+	SS_WAV,
+	SS_COMPRESS,
+	SS_OGGDEC,
+	SS_FILTER,
+	SS_COMMAND,
+	SS_RANDOM_SELECTOR,
+	SS_PLAYLIST_SELECTOR,
+	SS_CRYPT,
+	SS_HTTP_SEND,
+	SS_ORTP_SEND,
+	SS_DB,
+	SS_OGG,
+	SS_MP3,
+	SS_MP3DEC,
+	SS_SERVER,
+	SS_AFS,
+	SS_MYSQL_SELECTOR,
+	SS_IPC,
+	SS_DCCP,
+	SS_DCCP_RECV,
+	SS_DCCP_SEND,
+	SS_FD,
+	SS_GUI,
+	SS_RINGBUFFER};
+
 #define NUM_SS (SS_RINGBUFFER + 1)
 extern const char **para_errlist[];
 /** \endcond */
@@ -102,11 +137,11 @@ extern const char **para_errlist[];
 #define GRAB_CLIENT_ERRORS \
 	PARA_ERROR(PEDANTIC_GRAB, "fd not ready and pedantic grab requested"), \
 	PARA_ERROR(GC_WRITE, "grab client write error"), \
-	PARA_ERROR(INVALID_GRAB_MODE, "invalid grab client mode"), \
 	PARA_ERROR(BAD_GC_SLOT, "invalid slot requested by grab client"), \
 	PARA_ERROR(BAD_GC_FILTER_NUM, "invalid filter number given"), \
 	PARA_ERROR(GC_SYNTAX, "grab client syntax error"), \
 	PARA_ERROR(GC_HELP_GIVEN, ""), /* not really an error */ \
+	PARA_ERROR(GC_VERSION_GIVEN, ""), /* not really an error */ \
 
 
 #define MP3DEC_ERRORS \
@@ -123,6 +158,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(SIGNAL_SIG_ERR, "signal() retured SIG_ERR"), \
 	PARA_ERROR(SIGNAL_READ, "read error from signal pipe"), \
 	PARA_ERROR(WAITPID, "waitpid error"), \
+	PARA_ERROR(SIGNAL_PIPE, "failed to setup signal pipe"), \
 
 
 #define STRING_ERRORS \
@@ -185,12 +221,12 @@ extern const char **para_errlist[];
 	PARA_ERROR(WRITE_OK, "can not check whether fd is writable"), \
 
 
-#define DOPEY_ERRORS \
+#define RANDOM_SELECTOR_ERRORS \
 	PARA_ERROR(FILE_COUNT, "audio file count exceeded"), \
 	PARA_ERROR(NOTHING_FOUND, "no audio files found"), \
 
 
-#define MYSQL_ERRORS \
+#define MYSQL_SELECTOR_ERRORS \
 	PARA_ERROR(MYSQL_SYNTAX, "mysql syntax error"), \
 	PARA_ERROR(NOTCONN, "not connected to mysql server"), \
 	PARA_ERROR(TOOBIG, "mysql: file too large"), \
@@ -215,7 +251,7 @@ extern const char **para_errlist[];
 #define COMMAND_ERRORS \
 	PARA_ERROR(COMMAND_SYNTAX, "syntax error in command"), \
 	PARA_ERROR(AUTH, "did not receive auth request"), \
-	PARA_ERROR(BAD_DBTOOL, "no such database tool"), \
+	PARA_ERROR(BAD_SELECTOR, "no such audio file selector"), \
 	PARA_ERROR(NO_AUDIO_FILE, "no audio file"), \
 	PARA_ERROR(BAD_CMD, "invalid command"), \
 	PARA_ERROR(PERM, "permission denied"), \
@@ -224,6 +260,38 @@ extern const char **para_errlist[];
 	PARA_ERROR(LOCK, "lock error"), \
 	PARA_ERROR(SENDER_CMD, "command not supported by this sender"), \
 
+#define PLAYLIST_SELECTOR_ERRORS \
+	PARA_ERROR(LOAD_PLAYLIST, "failed to load playlist"), \
+
+
+#define IPC_ERRORS \
+	PARA_ERROR(SEM_GET, "failed to create semaphore"), \
+	PARA_ERROR(SEM_REMOVE, "can not remove semaphore"), \
+	PARA_ERROR(SHM_GET, "failed to allocate shared memory area"), \
+	PARA_ERROR(SHM_DESTROY, "failed to destroy shared memory area"), \
+	PARA_ERROR(SHM_ATTACH, "can not attach shared memory area"), \
+	PARA_ERROR(SHM_DETACH, "can not detach shared memory area"), \
+
+
+#define DCCP_ERRORS \
+	PARA_ERROR(DCCP_SOCKET, "can not create dccp socket"), \
+	PARA_ERROR(DCCP_PACKET_SIZE, "failed to set dccp packet size"), \
+	PARA_ERROR(DCCP_SERVICE, "could not get service code"), \
+
+
+#define DCCP_RECV_ERRORS \
+	PARA_ERROR(ADDR_INFO, "getaddrinfo error"), \
+	PARA_ERROR(DCCP_OVERRUN, "dccp output buffer buffer overrun"), \
+	PARA_ERROR(DCCP_CONNECT, "dccp connect error"), \
+
+#define DCCP_SEND_ERRORS \
+	PARA_ERROR(DCCP_BIND, "dccp bind error"), \
+	PARA_ERROR(DCCP_LISTEN, "dccp listen error"), \
+	PARA_ERROR(DCCP_WRITE, "dccp write error"), \
+
+#define FD_ERRORS \
+	PARA_ERROR(F_GETFL, "failed to get fd flags"), \
+	PARA_ERROR(F_SETFL, "failed to set fd flags")
 
 /* these do not need error handling (yet) */
 #define SERVER_ERRORS
@@ -233,6 +301,7 @@ extern const char **para_errlist[];
 #define CLOSE_ON_FORK_ERRORS
 #define DAEMON_ERRORS
 #define ORTP_SEND_ERRORS
+#define GUI_ERRORS
 #define RINGBUFFER_ERRORS
 
 
@@ -331,12 +400,19 @@ SS_ENUM(OGG);
 SS_ENUM(SERVER);
 SS_ENUM(AFS);
 SS_ENUM(COMMAND);
-SS_ENUM(DOPEY);
+SS_ENUM(RANDOM_SELECTOR);
+SS_ENUM(PLAYLIST_SELECTOR);
 SS_ENUM(CRYPT);
 SS_ENUM(HTTP_SEND);
 SS_ENUM(ORTP_SEND);
 SS_ENUM(DB);
-SS_ENUM(MYSQL);
+SS_ENUM(MYSQL_SELECTOR);
+SS_ENUM(IPC);
+SS_ENUM(DCCP);
+SS_ENUM(DCCP_RECV);
+SS_ENUM(DCCP_SEND);
+SS_ENUM(FD);
+SS_ENUM(GUI);
 SS_ENUM(RINGBUFFER);
 /** \endcond */
 #undef PARA_ERROR