X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=89910a47cd028c0eeb851b428bf08afca928e8b2;hp=41ea245912f6e30d46fac54467447988bb0ffb37;hb=47a19b175dd1f39a878c948ae56a0d7054da20cc;hpb=68e0489ae1fe946162d9cedb7767513f2d4ea8d2 diff --git a/error.h b/error.h index 41ea2459..89910a47 100644 --- a/error.h +++ b/error.h @@ -13,9 +13,7 @@ DEFINE_ERRLIST_OBJECT_ENUM; /* these do not need error handling (yet) */ #define SERVER_ERRORS -#define CLIENT_ERRORS -#define WAV_ERRORS -#define COMPRESS_ERRORS +#define WAV_FILTER_ERRORS #define TIME_ERRORS #define CLOSE_ON_FORK_ERRORS #define DAEMON_ERRORS @@ -26,12 +24,34 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define SHA1_ERRORS #define RBTREE_ERRORS #define RECV_ERRORS -#define SEND_COMMON_ERRORS #define STDOUT_ERRORS +#define IPC_ERRORS +#define DCCP_SEND_ERRORS +#define HTTP_SEND_ERRORS extern const char **para_errlist[]; +#define COMPRESS_FILTER_ERRORS \ + PARA_ERROR(COMPRESS_SYNTAX, "syntax error in compress filter config"), \ + + +#define AMP_FILTER_ERRORS \ + PARA_ERROR(AMP_SYNTAX, "syntax error in amp filter config"), \ + + +#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 +116,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 +123,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 +134,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,6 +179,7 @@ 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"), \ @@ -220,7 +240,7 @@ extern const char **para_errlist[]; PARA_ERROR(INVALID_AUDIOD_CMD, "invalid command"), \ -#define FILTER_CHAIN_ERRORS \ +#define FILTER_COMMON_ERRORS \ PARA_ERROR(UNSUPPORTED_FILTER, "given filter not supported"), \ PARA_ERROR(BAD_FILTER_OPTIONS, "invalid filter option given"), \ PARA_ERROR(FC_EOF, "filter chain: eof"), \ @@ -231,13 +251,14 @@ extern const char **para_errlist[]; PARA_ERROR(UNKNOWN_STAT_ITEM, "status item not recognized"), \ -#define OGGDEC_ERRORS \ +#define OGGDEC_FILTER_ERRORS \ PARA_ERROR(OGGDEC_READ, "read from media returned an error"), \ PARA_ERROR(OGGDEC_NOTVORBIS, "bitstream is not vorbis data"), \ PARA_ERROR(OGGDEC_VERSION, "vorbis version mismatch"), \ PARA_ERROR(OGGDEC_BADHEADER, "invalid vorbis bitstream header"), \ PARA_ERROR(OGGDEC_FAULT, "bug or heap/stack corruption"), \ PARA_ERROR(OGGDEC_BADLINK, "invalid stream section or requested link corrupt"), \ + PARA_ERROR(OGGDEC_SYNTAX, "syntax error in oggdec config"), \ #define GRAB_CLIENT_ERRORS \ @@ -250,9 +271,10 @@ extern const char **para_errlist[]; PARA_ERROR(GC_VERSION_GIVEN, ""), /* not really an error */ \ -#define MP3DEC_ERRORS \ +#define MP3DEC_FILTER_ERRORS \ PARA_ERROR(MAD_FRAME_DECODE, "mad frame decode error"), \ PARA_ERROR(MP3DEC_OVERRUN, "mp3 output buffer overrun"), \ + PARA_ERROR(MP3DEC_SYNTAX, "syntax error in mp3dec config"), \ #define FILTER_ERRORS \ @@ -273,7 +295,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 \ @@ -308,7 +329,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"), \ @@ -321,10 +341,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"), \ @@ -337,27 +353,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 \ @@ -396,7 +399,7 @@ extern const char **para_errlist[]; PARA_ERROR(WRITE_COMMON_SYNTAX, "syntax error in write option"), \ -#define AACDEC_ERRORS \ +#define AACDEC_FILTER_ERRORS \ PARA_ERROR(AACDEC_INIT, "failed to init aac decoder"), \ PARA_ERROR(AAC_DECODE, "aac decode error"), \ PARA_ERROR(AAC_OVERRUN, "aac output buffer overrun"), \