X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=37ff48a9463780220cd7e02b431d622080a432a4;hp=ce9ab5283c8d4ec8cc59d2e9c96476676e3bc96b;hb=6442f07bb08eb6e557086587f997b1785ea18ef7;hpb=c8862b9e246b4ef6ff1fe103946e18cf2537ecde diff --git a/error.h b/error.h index ce9ab528..37ff48a9 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 @@ -24,12 +22,50 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define RINGBUFFER_ERRORS #define SCORE_ERRORS #define SHA1_ERRORS -#define AFH_COMMON_ERRORS #define RBTREE_ERRORS #define RECV_ERRORS +#define STDOUT_ERRORS +#define IPC_ERRORS +#define DCCP_SEND_ERRORS +#define HTTP_SEND_ERRORS +#define GGO_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"), \ + + +#define AFH_COMMON_ERRORS \ + PARA_ERROR(AUDIO_FORMAT, "audio format not recognized"), \ + + +#define ACL_ERRORS \ + PARA_ERROR(ACL_PERM, "access denied by acl"), \ + + #define FSCK_ERRORS \ PARA_ERROR(FSCK_SYNTAX, "fsck syntax error"), \ PARA_ERROR(RANGE_VIOLATION, "range violation detected, very bad"), \ @@ -81,7 +117,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"), \ @@ -89,6 +124,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 \ @@ -99,7 +135,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 \ @@ -145,25 +180,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"), \ @@ -197,8 +229,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 \ @@ -208,7 +241,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"), \ @@ -219,13 +252,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 \ @@ -238,9 +272,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 \ @@ -250,12 +285,9 @@ extern const char **para_errlist[]; #define SIGNAL_ERRORS \ PARA_ERROR(SIGNAL_SIG_ERR, "signal() returned SIG_ERR"), \ - PARA_ERROR(SIGNAL_READ, "read error from signal pipe"), \ #define STRING_ERRORS \ - PARA_ERROR(MKSTEMP, "mkstemp error: unable to create tmp file"), \ - PARA_ERROR(FCHMOD, "fchmod error: can not set mode"), \ PARA_ERROR(ATOI_OVERFLOW, "value too large"), \ PARA_ERROR(STRTOLL, "unknown strtoll error"), \ PARA_ERROR(ATOI_NO_DIGITS, "no digits found in string"), \ @@ -264,7 +296,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 \ @@ -299,10 +330,6 @@ extern const char **para_errlist[]; #define VSS_ERRORS \ - PARA_ERROR(BAD_AUDIO_FILE_SUFFIX, "unknown suffix"), \ - PARA_ERROR(AUDIO_FORMAT, "audio format not recognized"), \ - PARA_ERROR(CHUNK, "unable to get chunk"), \ - PARA_ERROR(SHORT_AFS_READ, "short read from afs socket"), \ PARA_ERROR(NOFD, "did not receive open fd from afs"), \ @@ -315,11 +342,6 @@ extern const char **para_errlist[]; PARA_ERROR(CHALLENGE, "failed to read challenge"), \ -#define HTTP_SEND_ERRORS \ - PARA_ERROR(WRITE_OK, "can not check whether fd is writable"), \ - PARA_ERROR(SEND_QUEUED_CHUNK, "failed to send queued chunk"), \ - - #define COMMAND_ERRORS \ PARA_ERROR(COMMAND_SYNTAX, "syntax error in command"), \ PARA_ERROR(AUTH, "did not receive auth request"), \ @@ -332,33 +354,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 \ - PARA_ERROR(DCCP_WRITE, "dccp write error"), \ - - #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"), \ @@ -373,8 +380,6 @@ extern const char **para_errlist[]; PARA_ERROR(HW_PARAMS, "unable to install hw params"), \ PARA_ERROR(SW_PARAMS, "unable to install sw params"), \ PARA_ERROR(BAD_PERIOD, "can not use period equal to buffer size"), \ - PARA_ERROR(GET_XFER, "unable to obtain xfer align"), \ - PARA_ERROR(SET_XFER, "snd_pcm_sw_params_set_xfer_align() failed"), \ PARA_ERROR(ALSA_WRITE, "alsa write error"), \ PARA_ERROR(PCM_OPEN, "unable to open pcm"), \ PARA_ERROR(SND_PCM_INFO, "pcm info error"), \ @@ -395,7 +400,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"), \