X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=f0a2510da3c8425d4c514b3cbf2da977b7e877f6;hp=b9e19f55fcabb190123cc559ae342c488403281f;hb=3ac5b35d84326f7dabc55688b520e85d499155bf;hpb=db2953d4922b4afb303ca73c75d53a2dbba3acd6

diff --git a/error.h b/error.h
index b9e19f55..f0a2510d 100644
--- a/error.h
+++ b/error.h
@@ -13,7 +13,6 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 
 /* these do not need error handling (yet) */
 #define SERVER_ERRORS
-#define CLIENT_ERRORS
 #define WAV_ERRORS
 #define COMPRESS_ERRORS
 #define TIME_ERRORS
@@ -26,10 +25,27 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define SHA1_ERRORS
 #define RBTREE_ERRORS
 #define RECV_ERRORS
-#define SEND_COMMON_ERRORS
+#define STDOUT_ERRORS
+#define IPC_ERRORS
+#define AMP_FILTER_ERRORS
+#define DCCP_SEND_ERRORS
+#define HTTP_SEND_ERRORS
+
 
 extern const char **para_errlist[];
 
+#define SEND_COMMON_ERRORS \
+	PARA_ERROR(MAX_CLIENTS, "maximal number of clients exceeded"), \
+
+
+#define FADE_ERRORS \
+	PARA_ERROR(FADE_SYNTAX, "fade syntax error"), \
+
+
+#define CLIENT_ERRORS \
+	PARA_ERROR(TASK_STARTED, "task started"), \
+
+
 #define AFH_ERRORS \
 	PARA_ERROR(AFH_SYNTAX, "afh syntax error"), \
 	PARA_ERROR(AFH_SHORT_WRITE, "afh short write"), \
@@ -94,7 +110,6 @@ extern const char **para_errlist[];
 	PARA_ERROR(AFS_SYNTAX, "afs syntax error"), \
 	PARA_ERROR(AFS_SIGNAL, "afs caught deadly signal"), \
 	PARA_ERROR(AFS_SOCKET, "afs socket not writable"), \
-	PARA_ERROR(AFS_PARENT_DIED, "fatal: server process terminated"), \
 	PARA_ERROR(AFS_SHORT_READ, "short read from afs socket"), \
 
 
@@ -102,6 +117,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(MOOD_SYNTAX, "mood syntax error"), \
 	PARA_ERROR(NO_MOOD, "no mood available"), \
 	PARA_ERROR(NOT_ADMISSIBLE, "file is not admissible"), \
+	PARA_ERROR(DUMMY_ROW, "attempted to access blob dummy object"), \
 
 
 #define ATTRIBUTE_ERRORS \
@@ -112,7 +128,6 @@ extern const char **para_errlist[];
 
 #define BLOB_ERRORS \
 	PARA_ERROR(BLOB_SYNTAX, "blob syntax error"), \
-	PARA_ERROR(DUMMY_ROW, "attempted to access blob dummy object"), \
 
 
 #define PLAYLIST_ERRORS \
@@ -158,25 +173,22 @@ extern const char **para_errlist[];
 	PARA_ERROR(CLIENT_SYNTAX, "syntax error"), \
 	PARA_ERROR(INVALID_CHALLENGE, "did not receive valid challenge"), \
 	PARA_ERROR(NO_CONFIG, "config file not found"), \
+	PARA_ERROR(BAD_CONFIG, "syntax error in config file"), \
 	PARA_ERROR(CLIENT_AUTH, "authentication failed"), \
 	PARA_ERROR(SERVER_EOF, "connection closed by para_server"), \
-	PARA_ERROR(HANDSHAKE_COMPLETE, ""), /* not really an error */ \
 
 
 #define SCHED_ERRORS \
 	PARA_ERROR(TASK_KILLED, "task killed"), \
+	PARA_ERROR(TASK_UNREGISTERED, "task has been unscheduled"), \
 	PARA_ERROR(NO_SUCH_TASK, "task not found"), \
 	PARA_ERROR(NOT_INITIALIZED, "scheduler not yet initialized"), \
 
 
 #define STDIN_ERRORS \
-	PARA_ERROR(STDIN_READ, "failed to read from stdin"), \
 	PARA_ERROR(STDIN_EOF, "end of file"), \
 
 
-#define STDOUT_ERRORS \
-	PARA_ERROR(STDOUT_WRITE, "failed to write to stdout"), \
-
 
 #define NET_ERRORS \
 	PARA_ERROR(NAME_TOO_LONG, "name too long for struct sockaddr_un"), \
@@ -210,8 +222,9 @@ extern const char **para_errlist[];
 	PARA_ERROR(NO_MORE_SLOTS, "no more empty slots"), \
 	PARA_ERROR(MISSING_COLON, "syntax error: missing colon"), \
 	PARA_ERROR(UNSUPPORTED_AUDIO_FORMAT, "given audio format not supported"), \
-	PARA_ERROR(SIGNAL_CAUGHT, "caught signal"), \
 	PARA_ERROR(NOT_PLAYING, "not playing"), \
+	PARA_ERROR(AUDIOD_OFF, "audiod switched off"), \
+	PARA_ERROR(STATUS_TIMEOUT, "timeout reading server status"), \
 
 
 #define AUDIOD_COMMAND_ERRORS \
@@ -274,7 +287,6 @@ extern const char **para_errlist[];
 
 #define EXEC_ERRORS \
 	PARA_ERROR(DUP_PIPE, "exec error: can not create pipe"), \
-	PARA_ERROR(NULL_OPEN, "can not open /dev/null"), \
 
 
 #define MP3_AFH_ERRORS \
@@ -309,7 +321,6 @@ extern const char **para_errlist[];
 
 
 #define VSS_ERRORS \
-	PARA_ERROR(CHUNK, "unable to get chunk"), \
 	PARA_ERROR(NOFD, "did not receive open fd from afs"), \
 
 
@@ -322,10 +333,6 @@ extern const char **para_errlist[];
 	PARA_ERROR(CHALLENGE, "failed to read challenge"), \
 
 
-#define HTTP_SEND_ERRORS \
-	PARA_ERROR(MAX_CLIENTS, "maximal number of clients exceeded"), \
-
-
 #define COMMAND_ERRORS \
 	PARA_ERROR(COMMAND_SYNTAX, "syntax error in command"), \
 	PARA_ERROR(AUTH, "did not receive auth request"), \
@@ -338,32 +345,18 @@ extern const char **para_errlist[];
 	PARA_ERROR(BAD_USER, "you don't exist. Go away."), \
 
 
-#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_RECV_ERRORS \
 	PARA_ERROR(DCCP_OVERRUN, "dccp output buffer buffer overrun"), \
 
 
-#define DCCP_SEND_ERRORS \
-
-
 #define FD_ERRORS \
 	PARA_ERROR(FGETS, "fgets error"), \
 	PARA_ERROR(EMPTY, "file empty"), \
 	PARA_ERROR(MMAP, "mmap error"), \
-	PARA_ERROR(MUNMAP, "munmap failed"), \
 
 
 #define WRITE_ERRORS \
 	PARA_ERROR(WRITE_SYNTAX, "para_write syntax error"), \
-	PARA_ERROR(PREMATURE_END, "premature end of audio file"), \
 	PARA_ERROR(NO_WAV_HEADER, "wave header not found"), \
 	PARA_ERROR(WAV_HEADER_SUCCESS, "successfully read wave header"), \
 	PARA_ERROR(NO_DELAY, "no initial delay"), \