X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=661602e2e39f7734400db51e5be92bb883e1e57e;hp=ba18c6dcf81382f4fb4bccaa090704857c6cc9fe;hb=5cf6f5f9fbef995c60a9a2e95bd049a0ee256404;hpb=b2e6a24448a9e49e0766ab4f32163580eeff469e diff --git a/error.h b/error.h index ba18c6dc..661602e2 100644 --- a/error.h +++ b/error.h @@ -6,8 +6,6 @@ /** \file error.h List of error messages for all subsystems. */ -#include - /** \cond */ /* List of all subsystems that use paraslash's error facility. */ @@ -25,19 +23,54 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define SHA1_ERRORS #define RBTREE_ERRORS #define RECV_ERRORS -#define STDOUT_ERRORS #define IPC_ERRORS #define DCCP_SEND_ERRORS #define HTTP_SEND_ERRORS #define GGO_ERRORS #define COLOR_ERRORS #define SIGNAL_ERRORS +#define FADE_ERRORS +#define SERVER_COMMAND_LIST_ERRORS +#define AFS_COMMAND_LIST_ERRORS +#define AUDIOD_COMMAND_LIST_ERRORS +#define BUFFER_TREE_ERRORS extern const char **para_errlist[]; +#define STDOUT_ERRORS \ + PARA_ERROR(ORPHAN, "orphaned (EOF)"), \ + + +#define BITSTREAM_ERRORS \ + PARA_ERROR(VLC, "invalid vlc code"), \ + + +#define WMA_AFH_ERRORS \ + PARA_ERROR(NO_WMA, "asf/wma format not recognized"), \ + + +#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 \ + PARA_ERROR(WMA_BAD_PARAMS, "invalid WMA parameters"), \ + PARA_ERROR(WMA_OUTPUT_SPACE, "insufficient output space"), \ + PARA_ERROR(WMA_BAD_SUPERFRAME, "invalid superframe"), \ + PARA_ERROR(WMA_BLOCK_SIZE, "invalid block size"), \ + PARA_ERROR(INCOHERENT_BLOCK_LEN, "incoherent block length"), \ + + +#define IMDCT_ERRORS \ + PARA_ERROR(FFT_BAD_PARAMS, "invalid params for fft"), \ + + #define PREBUFFER_FILTER_ERRORS \ PARA_ERROR(PREBUFFER_SYNTAX, "syntax error in prebuffer filter config"), \ + PARA_ERROR(PREBUFFER_SUCCESS, "prebuffering complete"), \ + #define OSS_WRITE_ERRORS \ PARA_ERROR(BAD_SAMPLE_FORMAT, "sample format not supported"), \ @@ -51,6 +84,8 @@ extern const char **para_errlist[]; #define WAV_FILTER_ERRORS \ PARA_ERROR(WAV_BAD_FC, "invalid filter chain configuration"), \ + PARA_ERROR(WAV_EOF, "wav filter: end of file"), \ + PARA_ERROR(WAV_SUCCESS, "successfully wrote wav header"), \ #define FEC_ERRORS \ @@ -76,10 +111,6 @@ extern const char **para_errlist[]; 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"), \ @@ -113,12 +144,14 @@ extern const char **para_errlist[]; #define MOOD_ERRORS \ - 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 MM_ERRORS \ + PARA_ERROR(MOOD_SYNTAX, "mood syntax error"), \ + + #define ATTRIBUTE_ERRORS \ PARA_ERROR(ATTR_SYNTAX, "attribute syntax error"), \ PARA_ERROR(NO_ATTRIBUTES, "no attributes defined yet"), \ @@ -186,6 +219,7 @@ extern const char **para_errlist[]; #define STDIN_ERRORS \ PARA_ERROR(STDIN_EOF, "end of file"), \ + PARA_ERROR(STDIN_NO_CHILD, "stdin btr node has no children"), \ @@ -208,6 +242,7 @@ extern const char **para_errlist[]; #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 \ @@ -229,6 +264,8 @@ extern const char **para_errlist[]; PARA_ERROR(AUDIOD_SYNTAX, "syntax error"), \ PARA_ERROR(UCRED_PERM, "permission denied"), \ PARA_ERROR(INVALID_AUDIOD_CMD, "invalid command"), \ + PARA_ERROR(TOO_MANY_CLIENTS, "maximal number of stat clients exceeded"), \ + PARA_ERROR(UNKNOWN_STAT_ITEM, "status item not recognized"), \ #define FILTER_COMMON_ERRORS \ @@ -238,8 +275,7 @@ extern const char **para_errlist[]; #define STAT_ERRORS \ - PARA_ERROR(TOO_MANY_CLIENTS, "maximal number of stat clients exceeded"), \ - PARA_ERROR(UNKNOWN_STAT_ITEM, "status item not recognized"), \ + PARA_ERROR(STAT_ITEM_PARSE, "failed to parse status item"), \ #define OGGDEC_FILTER_ERRORS \ @@ -253,19 +289,17 @@ extern const char **para_errlist[]; #define GRAB_CLIENT_ERRORS \ - PARA_ERROR(PEDANTIC_GRAB, "fd not ready and pedantic grab requested"), \ 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"), \ - PARA_ERROR(GC_HELP_GIVEN, ""), /* not really an error */ \ - PARA_ERROR(GC_VERSION_GIVEN, ""), /* not really an 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"), \ #define FILTER_ERRORS \ @@ -278,6 +312,8 @@ extern const char **para_errlist[]; PARA_ERROR(STRTOLL, "unknown strtoll error"), \ PARA_ERROR(ATOI_NO_DIGITS, "no digits found in string"), \ PARA_ERROR(ATOI_JUNK_AT_END, "further characters after number"), \ + PARA_ERROR(SIZE_PREFIX, "bad size prefix"), \ + PARA_ERROR(REGEX, "regular expression error") \ #define EXEC_ERRORS \ @@ -304,15 +340,12 @@ extern const char **para_errlist[]; #define OGG_AFH_ERRORS \ - PARA_ERROR(OGG_READ, "ogg read error"), \ 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_INFO, "ov_info error"), \ - PARA_ERROR(OGG_VERSION, "unsupported ogg version"), \ - PARA_ERROR(OGG_BAD_HEADER, "invalid ogg vorbis header"), \ - PARA_ERROR(OGG_UNKNOWN_ERROR, "unknown ogg vorbis error"), \ + PARA_ERROR(OGG_SYNC, "internal ogg storage overflow"), \ + PARA_ERROR(OGG_EMPTY, "no ogg pages found"), \ #define VSS_ERRORS \ @@ -327,18 +360,21 @@ extern const char **para_errlist[]; 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"), \ #define COMMAND_ERRORS \ PARA_ERROR(COMMAND_SYNTAX, "syntax error in command"), \ - PARA_ERROR(AUTH, "did not receive auth request"), \ + PARA_ERROR(AUTH_REQUEST, "did not receive auth request"), \ PARA_ERROR(NO_AUDIO_FILE, "no audio file"), \ PARA_ERROR(BAD_CMD, "invalid command"), \ PARA_ERROR(PERM, "permission denied"), \ PARA_ERROR(LOCK, "lock error"), \ PARA_ERROR(SENDER_CMD, "command not supported by this sender"), \ PARA_ERROR(SERVER_CRASH, "para_server crashed -- can not live without it"), \ - PARA_ERROR(BAD_USER, "you don't exist. Go away."), \ + PARA_ERROR(BAD_USER, "auth request for invalid user"), \ + PARA_ERROR(BAD_AUTH, "authentication failure"), \ #define DCCP_RECV_ERRORS \ @@ -355,6 +391,7 @@ extern const char **para_errlist[]; 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 \ @@ -372,6 +409,7 @@ 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"), \ #define FILE_WRITE_ERRORS \ @@ -483,8 +521,10 @@ _static_inline_ int is_errno(int num, int _errno) _static_inline_ const char *para_strerror(int num) { assert(num > 0); +#ifdef _OSL_H if (IS_OSL_ERROR(num)) return osl_strerror(num & ((1 << OSL_ERROR_BIT) - 1)); +#endif if (IS_SYSTEM_ERROR(num)) return strerror(num & ((1 << SYSTEM_ERROR_BIT) - 1)); return para_errlist[ERRNUM_TO_SS(num)][ERRNUM_TO_INDEX(num)]; @@ -496,19 +536,18 @@ _static_inline_ const char *para_strerror(int num) * \param ret The return value of an osl library function. * * This should be used for all calls to osl functions that return an osl error - * code. It changes the return value to \p -E_OSL appropriately so that it can - * be used for printing the correct error message. + * code. It changes the return value appropriately so that it can be used for + * printing the correct error message vi para_strerror(). * - * \return \a ret if \a ret >= 0, \p -E_OSL otherwise. + * \return \a ret if \a ret >= 0, a paraslash error code otherwise. */ _static_inline_ int osl(int ret) { if (ret >= 0) return ret; - return OSL_ERRNO_TO_PARA_ERROR(-ret); + return -OSL_ERRNO_TO_PARA_ERROR(-ret); } - /** * Define the error list for one subsystem. #