X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=error.h;h=f0a2510da3c8425d4c514b3cbf2da977b7e877f6;hb=5c575441c5ac69d3107d8032c1c1d2d7f5c72ee1;hp=6b8403d1a91c3fd67e2a73f5e971f07896970e43;hpb=335730538150250f32c0df0b184fb494e2bb0df3;p=paraslash.git

diff --git a/error.h b/error.h
index 6b8403d1..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,12 +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"), \
@@ -96,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"), \
 
 
@@ -104,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 \
@@ -114,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 \
@@ -160,12 +173,14 @@ 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"), \
 
 
 #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"), \
 
@@ -208,6 +223,8 @@ extern const char **para_errlist[];
 	PARA_ERROR(MISSING_COLON, "syntax error: missing colon"), \
 	PARA_ERROR(UNSUPPORTED_AUDIO_FORMAT, "given audio format not supported"), \
 	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 \
@@ -270,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 \
@@ -305,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"), \
 
 
@@ -318,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"), \
@@ -334,27 +345,14 @@ 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 \