X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;fp=error.h;h=4b3cce28bf4f67b69d4d5abe8749a8d8e4846daa;hp=9ed59c15564d50da538528c6b931f15d6be5323d;hb=1f556ae88bd8c85d4452f689f532f5a6abeabe92;hpb=abbddde3ee707103d5d8b088c8fa6fc53f09ebff

diff --git a/error.h b/error.h
index 9ed59c15..4b3cce28 100644
--- a/error.h
+++ b/error.h
@@ -19,13 +19,45 @@
 /** \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_RANDOM_DBTOOL, SS_PLM_DBTOOL, SS_CRYPT, SS_HTTP_SEND, SS_ORTP_SEND, SS_DB, SS_OGG,
-	SS_MP3, SS_MP3DEC, SS_SERVER, SS_AFS, SS_MYSQL, SS_IPC, SS_DCCP, SS_DCCP_RECV,
-	SS_DCCP_SEND, 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_RINGBUFFER};
+
 #define NUM_SS (SS_RINGBUFFER + 1)
 extern const char **para_errlist[];
 /** \endcond */
@@ -186,12 +218,12 @@ extern const char **para_errlist[];
 	PARA_ERROR(WRITE_OK, "can not check whether fd is writable"), \
 
 
-#define RANDOM_DBTOOL_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"), \
@@ -216,7 +248,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"), \
@@ -225,7 +257,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(LOCK, "lock error"), \
 	PARA_ERROR(SENDER_CMD, "command not supported by this sender"), \
 
-#define PLM_DBTOOL_ERRORS \
+#define PLAYLIST_SELECTOR_ERRORS \
 	PARA_ERROR(LOAD_PLAYLIST, "failed to load playlist"), \
 
 
@@ -360,13 +392,13 @@ SS_ENUM(OGG);
 SS_ENUM(SERVER);
 SS_ENUM(AFS);
 SS_ENUM(COMMAND);
-SS_ENUM(RANDOM_DBTOOL);
-SS_ENUM(PLM_DBTOOL);
+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);