X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=5a2e39b468fa58d7cb66bc3ca07f71012b02c2e2;hp=fd0213b21ced5874c35f2b6ef2735cab4baabfbd;hb=25518356767bd60bd03ac2f9c6b2381644483925;hpb=05492521d51352fa8c4f55b71b33e14656f0bd0d diff --git a/error.h b/error.h index fd0213b2..5a2e39b4 100644 --- a/error.h +++ b/error.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2009 Andre Noll + * Copyright (C) 2006-2011 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -16,7 +16,6 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define TIME_ERRORS #define CLOSE_ON_FORK_ERRORS #define DAEMON_ERRORS -#define UDP_SEND_ERRORS #define GUI_ERRORS #define RINGBUFFER_ERRORS #define SCORE_ERRORS @@ -33,13 +32,41 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define SERVER_COMMAND_LIST_ERRORS #define AFS_COMMAND_LIST_ERRORS #define AUDIOD_COMMAND_LIST_ERRORS -#define BUFFER_TREE_ERRORS - +#define STDOUT_ERRORS +#define FILE_WRITE_ERRORS +#define STDIN_ERRORS extern const char **para_errlist[]; -#define STDOUT_ERRORS \ - PARA_ERROR(ORPHAN, "orphaned (EOF)"), \ +#define OGG_AFH_COMMON_ERRORS \ + PARA_ERROR(STREAM_PACKETOUT, "ogg stream packet-out error (first packet)"), \ + PARA_ERROR(SYNC_PAGEOUT, "ogg sync page-out error (no ogg file?)"), \ + PARA_ERROR(STREAM_PAGEIN, "ogg stream page-in error (first page)"), \ + PARA_ERROR(OGG_SYNC, "internal ogg storage overflow"), \ + PARA_ERROR(OGG_EMPTY, "no ogg pages found"), \ + + +#define SPX_AFH_ERRORS \ + PARA_ERROR(SPX_COMMENT, "invalid speex comment"), \ + + +#define SPX_COMMON_ERRORS \ + PARA_ERROR(SPX_HEADER, "can not read speex header"), \ + PARA_ERROR(SPX_HEADER_MODE, "invalid speex mode in header"), \ + PARA_ERROR(SPX_VERSION, "incompatible speex bit stream version"), \ + PARA_ERROR(SPX_DECODER_INIT, "speex decoder initialization failed"), \ + PARA_ERROR(SPX_CTL_BAD_RQ, "speex_decoder_ctl: invalid request"), \ + PARA_ERROR(SPX_CTL_INVAL, "speex_decoder_ctl: invalid argument"), \ + +#define SPXDEC_FILTER_ERRORS \ + PARA_ERROR(SPX_DECODE, "speex decoding error"), \ + PARA_ERROR(SPX_DECODE_OVERFLOW, "speex decoding overflow"), \ + PARA_ERROR(SPX_EOS, "speex: end of stream"), \ + +#define BUFFER_TREE_ERRORS \ + PARA_ERROR(BTR_EOF, "buffer tree: end of file"), \ + PARA_ERROR(BTR_NO_CHILD, "btr node has no children"), \ + PARA_ERROR(BTR_NAVAIL, "btr node: value currently unavailable"), \ #define BITSTREAM_ERRORS \ @@ -52,7 +79,6 @@ extern const char **para_errlist[]; #define WMA_COMMON_ERRORS \ PARA_ERROR(WMA_NO_GUID, "audio stream guid not found"), \ - PARA_ERROR(WMA_BAD_ASF_HEADER, "invalid asf header"), \ #define WMADEC_FILTER_ERRORS \ @@ -77,14 +103,16 @@ extern const char **para_errlist[]; PARA_ERROR(BAD_SAMPLE_FORMAT, "sample format not supported"), \ PARA_ERROR(BAD_CHANNEL_COUNT, "channel count not supported"), \ PARA_ERROR(BAD_SAMPLERATE, "sample rate not supported"), \ + PARA_ERROR(OSS_EOF, "oss: end of file"), \ #define COMPRESS_FILTER_ERRORS \ PARA_ERROR(COMPRESS_SYNTAX, "syntax error in compress filter config"), \ + PARA_ERROR(COMPRESS_EOF, "compress: end of file"), \ #define WAV_FILTER_ERRORS \ - PARA_ERROR(WAV_BAD_FC, "invalid filter chain configuration"), \ + PARA_ERROR(WAV_BAD_FC, "invalid filter configuration"), \ PARA_ERROR(WAV_EOF, "wav filter: end of file"), \ PARA_ERROR(WAV_SUCCESS, "successfully wrote wav header"), \ @@ -106,6 +134,8 @@ extern const char **para_errlist[]; #define AMP_FILTER_ERRORS \ PARA_ERROR(AMP_SYNTAX, "syntax error in amp filter config"), \ + PARA_ERROR(AMP_ZERO_AMP, "no amplification necessary"), \ + PARA_ERROR(AMP_EOF, "amp: end of file"), \ #define SEND_COMMON_ERRORS \ @@ -129,19 +159,11 @@ extern const char **para_errlist[]; 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"), \ - PARA_ERROR(NOT_A_REGULAR_FILE, "not a regular file"), \ - #define AFS_ERRORS \ PARA_ERROR(BAD_TABLE_NAME, "invalid table"), \ - PARA_ERROR(INPUT_TOO_LARGE, "input too large for stdin command"), \ 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_SHORT_READ, "short read from afs socket"), \ - PARA_ERROR(OSL, "osl error"), \ #define MOOD_ERRORS \ @@ -161,6 +183,7 @@ extern const char **para_errlist[]; #define BLOB_ERRORS \ PARA_ERROR(BLOB_SYNTAX, "blob syntax error"), \ + PARA_ERROR(INPUT_TOO_LARGE, "input too large for stdin command"), \ #define PLAYLIST_ERRORS \ @@ -176,7 +199,6 @@ extern const char **para_errlist[]; PARA_ERROR(BAD_PATH, "invalid path"), \ PARA_ERROR(BAD_SORT, "invalid sorting method"), \ PARA_ERROR(FNMATCH, "fnmatch error"), \ - PARA_ERROR(NO_MATCH, "no matches"), \ PARA_ERROR(NO_AFHI, "audio format handler info required"), \ PARA_ERROR(AFT_SYNTAX, "audio file table syntax error"), \ PARA_ERROR(HASH_MISMATCH, "hash mismatch, consider re-add"), \ @@ -197,14 +219,10 @@ extern const char **para_errlist[]; #define AUDIOC_ERRORS \ PARA_ERROR(AUDIOC_SYNTAX, "audioc syntax error"), \ - PARA_ERROR(AUDIOC_READ, "audioc read error"), \ - PARA_ERROR(AUDIOC_WRITE, "audioc write error"), \ - PARA_ERROR(AUDIOC_OVERRUN, "audioc buffer overrun"), \ #define CLIENT_COMMON_ERRORS \ 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"), \ @@ -218,32 +236,28 @@ extern const char **para_errlist[]; PARA_ERROR(NOT_INITIALIZED, "scheduler not yet initialized"), \ -#define STDIN_ERRORS \ - PARA_ERROR(STDIN_EOF, "end of file"), \ - PARA_ERROR(STDIN_NO_CHILD, "stdin btr node has no children"), \ - - - #define NET_ERRORS \ PARA_ERROR(NAME_TOO_LONG, "name too long for struct sockaddr_un"), \ - PARA_ERROR(ADDRESS_LOOKUP, "address lookup / socket creation failed"), \ + PARA_ERROR(ADDRESS_LOOKUP, "can not resolve requested address"),\ PARA_ERROR(CHMOD, "failed to set socket mode"), \ PARA_ERROR(SENDMSG, "sendmsg() failed"), \ PARA_ERROR(RECVMSG, "recvmsg() failed"), \ PARA_ERROR(SCM_CREDENTIALS, "did not receive SCM credentials"), \ - PARA_ERROR(RECV_PATTERN, "did not receive expected pattern"), \ + PARA_ERROR(MAKESOCK, "makesock error"), \ #define UDP_RECV_ERRORS \ PARA_ERROR(UDP_SYNTAX, "udp_recv syntax error"), \ - PARA_ERROR(UDP_BAD_HEADER, "invalid udp audio header"), \ PARA_ERROR(UDP_OVERRUN, "output buffer overrun"), \ - PARA_ERROR(UDP_BAD_STREAM_TYPE, "invalid stream type"), \ + + +#define UDP_SEND_ERRORS \ + PARA_ERROR(TARGET_EXISTS, "requested target is already present"),\ + PARA_ERROR(TARGET_NOT_FOUND, "requested target not found") #define HTTP_RECV_ERRORS \ PARA_ERROR(HTTP_RECV_OVERRUN, "http_recv: output buffer overrun"), \ - PARA_ERROR(HTTP_RECV_NO_CHILD, "http_recv btr node has no children"), \ #define RECV_COMMON_ERRORS \ @@ -270,9 +284,8 @@ extern const char **para_errlist[]; #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"), \ + PARA_ERROR(UNSUPPORTED_FILTER, "given filter not supported"), \ #define STAT_ERRORS \ @@ -286,20 +299,15 @@ extern const char **para_errlist[]; 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"), \ - PARA_ERROR(OGGDEC_EOF, "oggdec: end of file"), \ #define GRAB_CLIENT_ERRORS \ PARA_ERROR(GC_WRITE, "grab client write error"), \ - PARA_ERROR(BAD_GC_SLOT, "invalid slot requested by grab client"), \ - PARA_ERROR(BAD_GC_FILTER_NUM, "invalid filter number given"), \ PARA_ERROR(GC_SYNTAX, "grab client syntax error"), \ #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"), \ PARA_ERROR(MP3DEC_EOF, "mp3dec: end of file"), \ @@ -342,17 +350,15 @@ extern const char **para_errlist[]; #define OGG_AFH_ERRORS \ - PARA_ERROR(SYNC_PAGEOUT, "ogg sync page-out error (no ogg file?)"), \ - PARA_ERROR(STREAM_PAGEIN, "ogg stream page-in error (first page)"), \ - PARA_ERROR(STREAM_PACKETOUT, "ogg stream packet-out error (first packet)"), \ PARA_ERROR(VORBIS, "vorbis synthesis header-in error (not vorbis?)"), \ - PARA_ERROR(OGG_SYNC, "internal ogg storage overflow"), \ - PARA_ERROR(OGG_EMPTY, "no ogg pages found"), \ + PARA_ERROR(OGG_PACKET_IN, "ogg_stream_packetin() failed"), \ + PARA_ERROR(OGG_STREAM_FLUSH, "ogg_stream_flush() failed"), \ #define VSS_ERRORS \ PARA_ERROR(NOFD, "did not receive open fd from afs"), \ - PARA_ERROR(BAD_CT, "invalid chunk table or bad FEC configuration") + PARA_ERROR(BAD_CT, "invalid chunk table or bad FEC configuration"), \ + PARA_ERROR(AFS_SHORT_READ, "short read from afs socket"), \ #define CRYPT_ERRORS \ @@ -361,7 +367,6 @@ extern const char **para_errlist[]; PARA_ERROR(RSA, "RSA error"), \ PARA_ERROR(ENCRYPT, "encrypt error"), \ PARA_ERROR(DECRYPT, "decrypt error"), \ - PARA_ERROR(CHALLENGE, "failed to read challenge"), \ PARA_ERROR(BLINDING, "failed to activate key blinding"), \ PARA_ERROR(KEY_PERM, "unprotected private key"), \ @@ -385,15 +390,13 @@ extern const char **para_errlist[]; #define FD_ERRORS \ PARA_ERROR(FGETS, "fgets error"), \ + PARA_ERROR(EOF, "end of file"), \ + PARA_ERROR(READ_PATTERN, "did not read expected pattern"), \ #define WRITE_ERRORS \ PARA_ERROR(WRITE_SYNTAX, "para_write syntax error"), \ 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"), \ - PARA_ERROR(DELAY_TIMEOUT, "initial delay timeout"), \ - PARA_ERROR(WRITE_EOF, "end of file"), \ #define ALSA_WRITE_ERRORS \ @@ -411,13 +414,8 @@ extern const char **para_errlist[]; PARA_ERROR(SET_RATE, "snd_pcm_hw_params_set_rate_near failed"), \ PARA_ERROR(START_THRESHOLD, "snd_pcm_sw_params_set_start_threshold() failed"), \ PARA_ERROR(STOP_THRESHOLD, "snd_pcm_sw_params_set_stop_threshold() failed"), \ - PARA_ERROR(ALSA_ORPHAN, "alsa btr node has no parent"), \ - + PARA_ERROR(ALSA_EOF, "alsa: end of file"), \ -#define FILE_WRITE_ERRORS \ - PARA_ERROR(FW_WRITE, "file writer write error"), \ - PARA_ERROR(FW_OPEN, "file writer: can not open output file"), \ - PARA_ERROR(FW_NO_FILE, "task started without open file"), \ #define WRITE_COMMON_ERRORS \ @@ -427,8 +425,6 @@ extern const char **para_errlist[]; #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"), \ - PARA_ERROR(AACDEC_EOF, "aacdec: end of file"), \ #define CHUNK_QUEUE_ERRORS \