X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=b735233339f1b64a89697e318db36436a907e091;hp=9864b1d98b3859f753b747d1f49080af41af633b;hb=a23e12ae76608a7ba3d333d8d76d5bbba0ba3ef0;hpb=e5f02e0748de02eabfb8e0746af09eb676ec1dc0 diff --git a/error.h b/error.h index 9864b1d9..b7352333 100644 --- a/error.h +++ b/error.h @@ -1,12 +1,12 @@ /* - * Copyright (C) 2006-2010 Andre Noll + * Copyright (C) 2006 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file error.h List of error messages for all subsystems. */ -/** \cond */ +/** \cond errors */ /* List of all subsystems that use paraslash's error facility. */ DEFINE_ERRLIST_OBJECT_ENUM; @@ -16,11 +16,9 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define TIME_ERRORS #define CLOSE_ON_FORK_ERRORS #define DAEMON_ERRORS -#define GUI_ERRORS +#define GUI_THEME_ERRORS #define RINGBUFFER_ERRORS #define SCORE_ERRORS -#define SHA1_ERRORS -#define RBTREE_ERRORS #define RECV_ERRORS #define IPC_ERRORS #define DCCP_SEND_ERRORS @@ -28,20 +26,92 @@ DEFINE_ERRLIST_OBJECT_ENUM; #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 OSS_MIX_ERRORS #define STDOUT_ERRORS #define FILE_WRITE_ERRORS #define STDIN_ERRORS +#define WRITE_ERRORS +#define CHECK_WAV_ERRORS +#define VERSION_ERRORS +#define SCHED_ERRORS + extern const char **para_errlist[]; +#define SYNC_FILTER_ERRORS\ + PARA_ERROR(SYNC_COMPLETE, "all buddies in sync"), \ + PARA_ERROR(SYNC_LISTEN_FD, "no fd to listen on"), \ + +#define ALSA_MIX_ERRORS \ + PARA_ERROR(ALSA_MIX_OPEN, "could not open mixer"), \ + PARA_ERROR(ALSA_MIX_GET_VAL, "could not read control element state"), \ + PARA_ERROR(ALSA_MIX_SET_VAL, "could not set control element state"), \ + PARA_ERROR(ALSA_MIX_RANGE, "value control element out of range"), \ + + +#define RESAMPLE_FILTER_ERRORS \ + PARA_ERROR(RESAMPLE_EOF, "resample filter: end of file"), \ + PARA_ERROR(LIBSAMPLERATE, "secret rabbit code error"), \ + + +#define OPUS_COMMON_ERRORS \ + PARA_ERROR(OPUS_HEADER, "invalid opus header"), \ + + +#define OPUS_AFH_ERRORS \ + PARA_ERROR(OPUS_COMMENT, "invalid or corrupted opus comment"), \ + + +#define OPUSDEC_FILTER_ERRORS \ + PARA_ERROR(CREATE_OPUS_DECODER, "could not create opus decoder"), \ + PARA_ERROR(OPUS_SET_GAIN, "opus: could not set gain"), \ + PARA_ERROR(OPUS_DECODE, "opus decode error"), \ + +#define SIDEBAND_ERRORS \ + PARA_ERROR(BAD_BAND, "invalid or unexpected band designator"), \ + PARA_ERROR(SB_PACKET_SIZE, "invalid sideband packet size or protocol error"), \ + + +#define PLAY_ERRORS \ + PARA_ERROR(PLAY_SYNTAX, "para_play: syntax error"), \ + PARA_ERROR(NO_VALID_FILES, "no valid file found in playlist"), \ + PARA_ERROR(BAD_PLAY_CMD, "invalid command"), \ + +#define FADE_ERRORS \ + PARA_ERROR(BAD_CHANNEL, "invalid channel"), \ + +#define FLACDEC_FILTER_ERRORS \ + PARA_ERROR(FLACDEC_DECODER_ALLOC, "could not allocate stream decoder"), \ + PARA_ERROR(FLACDEC_DECODER_INIT, "could not init stream decoder"), \ + PARA_ERROR(FLACDEC_EOF, "flacdec encountered end of file condition"), \ + +#define GUI_ERRORS \ + PARA_ERROR(GUI_SIGCHLD, "received SIGCHLD"), \ + +#define FLAC_AFH_ERRORS \ + PARA_ERROR(FLAC_CHAIN_ALLOC, "could not create metadata chain"), \ + PARA_ERROR(FLAC_CHAIN_READ, "could not read meta chain"), \ + PARA_ERROR(FLAC_ITER_ALLOC, "could not allocate meta iterator"), \ + PARA_ERROR(FLAC_VARBLOCK, "variable blocksize not supported"), \ + PARA_ERROR(FLAC_AFH_DECODER_ALLOC, "could not allocate stream decoder"), \ + PARA_ERROR(FLAC_AFH_DECODER_INIT, "could not init stream decoder"), \ + PARA_ERROR(FLAC_SKIP_META, "could not skip metadata"), \ + PARA_ERROR(FLAC_DECODE_POS, "could not get decode position"), \ + PARA_ERROR(FLAC_STREAMINFO, "could not read stream info meta block"), \ + PARA_ERROR(FLAC_REPLACE_COMMENT, "could not replace vorbis comment"), \ + PARA_ERROR(FLAC_WRITE_CHAIN, "failed to write metadata chain"), \ + + +#define AFH_RECV_ERRORS \ + PARA_ERROR(AFH_RECV_BAD_FILENAME, "invalid file name"), \ + + #define OGG_AFH_COMMON_ERRORS \ - PARA_ERROR(STREAM_PACKETOUT, "ogg stream packet-out error (first packet)"), \ + PARA_ERROR(STREAM_PACKETOUT, "ogg stream packet-out error"), \ + PARA_ERROR(STREAM_PACKETIN, "ogg stream packet-in 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_PAGEIN, "ogg stream page-in error"), \ + PARA_ERROR(STREAM_PAGEOUT, "ogg stream page-out error"), \ PARA_ERROR(OGG_SYNC, "internal ogg storage overflow"), \ PARA_ERROR(OGG_EMPTY, "no ogg pages found"), \ @@ -95,7 +165,6 @@ extern const char **para_errlist[]; #define PREBUFFER_FILTER_ERRORS \ - PARA_ERROR(PREBUFFER_SYNTAX, "syntax error in prebuffer filter config"), \ PARA_ERROR(PREBUFFER_SUCCESS, "prebuffering complete"), \ @@ -103,11 +172,22 @@ 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 AO_WRITE_ERRORS \ + PARA_ERROR(AO_DEFAULT_DRIVER, "ao: no usable output device"), \ + PARA_ERROR(AO_BAD_DRIVER, "ao: invalid driver"), \ + PARA_ERROR(AO_BAD_OPTION, "ao option is not of type key:value"), \ + PARA_ERROR(AO_APPEND_OPTION, "ao append option: memory allocation failure"), \ + PARA_ERROR(AO_OPEN_LIVE, "ao: could not open audio device"), \ + PARA_ERROR(AO_FILE_NOT_SUPP, "ao: file io drivers not supported"), \ + PARA_ERROR(AO_PLAY, "ao_play() failed"), \ + PARA_ERROR(AO_BAD_SAMPLE_FORMAT, "ao: unsigned sample formats not supported"), \ + PARA_ERROR(AO_PTHREAD, "pthread error"), \ + PARA_ERROR(AO_EOF, "ao: 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"), \ @@ -133,7 +213,6 @@ 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"), \ @@ -148,7 +227,6 @@ extern const char **para_errlist[]; #define AFH_ERRORS \ PARA_ERROR(AFH_SYNTAX, "afh syntax error"), \ - PARA_ERROR(AFH_SHORT_WRITE, "afh short write"), \ #define AFH_COMMON_ERRORS \ @@ -183,7 +261,6 @@ 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 \ @@ -193,7 +270,7 @@ extern const char **para_errlist[]; #define AFT_ERRORS \ - PARA_ERROR(BAD_AFSI, "invaiid afs info"), \ + PARA_ERROR(BAD_AFSI, "invalid afs info"), \ PARA_ERROR(LOCALTIME, "localtime() failed"), \ PARA_ERROR(STRFTIME, "strftime() failed"), \ PARA_ERROR(BAD_PATH, "invalid path"), \ @@ -202,6 +279,7 @@ extern const char **para_errlist[]; 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"), \ + PARA_ERROR(NO_MATCH, "no matches"), \ #define USER_LIST_ERRORS \ @@ -218,22 +296,17 @@ extern const char **para_errlist[]; #define AUDIOC_ERRORS \ - PARA_ERROR(AUDIOC_SYNTAX, "audioc syntax error"), \ + PARA_ERROR(AUDIOC_EOF, "audioc: end of file"), \ #define CLIENT_COMMON_ERRORS \ PARA_ERROR(CLIENT_SYNTAX, "syntax error"), \ 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"), \ + PARA_ERROR(SERVER_CMD_SUCCESS, "command terminated successfully"), \ + PARA_ERROR(SERVER_CMD_FAILURE, "command failed"), \ + PARA_ERROR(INCOMPAT_FEAT, "client/server incompatibility"), \ #define NET_ERRORS \ @@ -247,7 +320,6 @@ extern const char **para_errlist[]; #define UDP_RECV_ERRORS \ - PARA_ERROR(UDP_SYNTAX, "udp_recv syntax error"), \ PARA_ERROR(UDP_OVERRUN, "output buffer overrun"), \ @@ -271,12 +343,13 @@ extern const char **para_errlist[]; 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"), \ + PARA_ERROR(STATUS_TIMEOUT, "status item timeout"), \ + PARA_ERROR(AUDIOD_SIGNAL, "caught deadly signal"), \ + PARA_ERROR(AUDIOD_TERM, "terminating on user request"), \ #define AUDIOD_COMMAND_ERRORS \ PARA_ERROR(CLIENT_WRITE, "client write error"), \ - 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"), \ @@ -308,22 +381,22 @@ extern const char **para_errlist[]; #define MP3DEC_FILTER_ERRORS \ PARA_ERROR(MAD_FRAME_DECODE, "mad frame decode error"), \ - PARA_ERROR(MP3DEC_SYNTAX, "syntax error in mp3dec config"), \ PARA_ERROR(MP3DEC_EOF, "mp3dec: end of file"), \ + PARA_ERROR(MP3DEC_CORRUPT, "too many corrupt frames"), \ #define FILTER_ERRORS \ PARA_ERROR(NO_FILTERS, "at least one filter must be given"), \ - PARA_ERROR(FILTER_SYNTAX, "syntax error"), \ #define STRING_ERRORS \ PARA_ERROR(ATOI_OVERFLOW, "value too large"), \ - 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") \ + PARA_ERROR(REGEX, "regular expression error"), \ + PARA_ERROR(ARG_NOT_FOUND, "argument not found in arg vector"), \ + PARA_ERROR(BAD_LL, "invalid loglevel"), \ #define EXEC_ERRORS \ @@ -336,13 +409,16 @@ extern const char **para_errlist[]; PARA_ERROR(MP3_INFO, "could not read mp3 info"), \ PARA_ERROR(HEADER_FREQ, "invalid header frequency"), \ PARA_ERROR(HEADER_BITRATE, "invalid header bitrate"), \ - + PARA_ERROR(ID3_DETACH, "could not detach id3 frame"), \ + PARA_ERROR(ID3_ATTACH, "could not atttach id3 frame"), \ + PARA_ERROR(ID3_SETENCODING, "could not set id3 text encoding field"), \ + PARA_ERROR(ID3_SETSTRING, "could not set id3 string field"), \ #define AAC_AFH_ERRORS \ PARA_ERROR(STSZ, "did not find stcz atom"), \ PARA_ERROR(MP4ASC, "audio spec config error"), \ PARA_ERROR(AAC_AFH_INIT, "failed to init aac decoder"), \ - + PARA_ERROR(MP4V2, "mp4v2 library error"), \ #define AAC_COMMON_ERRORS \ PARA_ERROR(ESDS, "did not find esds atom"), \ @@ -351,6 +427,9 @@ extern const char **para_errlist[]; #define OGG_AFH_ERRORS \ PARA_ERROR(VORBIS, "vorbis synthesis header-in error (not vorbis?)"), \ + PARA_ERROR(VORBIS_COMMENTHEADER, "could not create vorbis comment header"), \ + PARA_ERROR(OGG_PACKET_IN, "ogg_stream_packetin() failed"), \ + PARA_ERROR(OGG_STREAM_FLUSH, "ogg_stream_flush() failed"), \ #define VSS_ERRORS \ @@ -359,6 +438,12 @@ extern const char **para_errlist[]; PARA_ERROR(AFS_SHORT_READ, "short read from afs socket"), \ +#define CRYPT_COMMON_ERRORS \ + PARA_ERROR(SSH_KEY_HEADER, "ssh key header not found"), \ + PARA_ERROR(BASE64, "failed to base64-decode ssh public key"), \ + PARA_ERROR(KEY_PERM, "unprotected private key"), \ + + #define CRYPT_ERRORS \ PARA_ERROR(PRIVATE_KEY, "can not read private key"), \ PARA_ERROR(PUBLIC_KEY, "can not read public key"), \ @@ -366,7 +451,20 @@ extern const char **para_errlist[]; PARA_ERROR(ENCRYPT, "encrypt error"), \ PARA_ERROR(DECRYPT, "decrypt error"), \ PARA_ERROR(BLINDING, "failed to activate key blinding"), \ - PARA_ERROR(KEY_PERM, "unprotected private key"), \ + PARA_ERROR(BIGNUM, "bignum error"), \ + +#define GCRYPT_ERRORS \ + PARA_ERROR(MPI_SCAN, "could not scan multi-precision integer"), \ + PARA_ERROR(MPI_PRINT, "could not convert multi-precision integer"), \ + PARA_ERROR(SEXP_FIND, "could not find sublist in S-expression"), \ + PARA_ERROR(SEXP_BUILD, "could not build S-expression"), \ + PARA_ERROR(SEXP_ENCRYPT, "could not encrypt S-expression"), \ + PARA_ERROR(SEXP_DECRYPT, "could not decrypt S-expression"), \ + PARA_ERROR(BAD_PRIVATE_KEY, "invalid private key"), \ + PARA_ERROR(KEY_MARKER, "invalid/missing key header or footer"), \ + PARA_ERROR(ASN1_PARSE, "could not parse ASN.1 key"), \ + PARA_ERROR(SSH_PARSE, "could not parse ssh public key"), \ + PARA_ERROR(OEAP, "error during oeap (un)padding"), \ #define COMMAND_ERRORS \ @@ -379,6 +477,7 @@ extern const char **para_errlist[]; 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, "auth request for invalid user"), \ + PARA_ERROR(BAD_FEATURE, "invalid feature request"), \ PARA_ERROR(BAD_AUTH, "authentication failure"), \ @@ -390,46 +489,32 @@ extern const char **para_errlist[]; 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(SHORT_WRITE, "unexpected short write"), \ + PARA_ERROR(EMPTY, "file is empty"), \ #define ALSA_WRITE_ERRORS \ - PARA_ERROR(BROKEN_CONF, "Broken alsa configuration"), \ - PARA_ERROR(ACCESS_TYPE, "alsa access type not available"), \ - PARA_ERROR(SAMPLE_FORMAT, "sample format not available"), \ - PARA_ERROR(CHANNEL_COUNT, "channels count not available"), \ - PARA_ERROR(HW_PARAMS, "unable to install hw params"), \ - PARA_ERROR(BAD_PERIOD, "can not use period equal to buffer size"), \ - PARA_ERROR(ALSA_WRITE, "alsa write error"), \ - PARA_ERROR(PCM_OPEN, "unable to open pcm"), \ - PARA_ERROR(PHYSICAL_WIDTH, "unable to determine bytes per frame"), \ - PARA_ERROR(GET_BUFFER_TIME, "snd_pcm_hw_params_get_buffer_time_max() failed"), \ - PARA_ERROR(SET_BUFFER_TIME, "snd_pcm_hw_params_set_buffer_time_near() failed"), \ - 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_EOF, "alsa: end of file"), \ - + PARA_ERROR(ALSA, "alsa error"), \ #define WRITE_COMMON_ERRORS \ - PARA_ERROR(WRITE_COMMON_SYNTAX, "syntax error in write option"), \ + PARA_ERROR(WRITE_COMMON_EOF, "end of file"), \ #define AACDEC_FILTER_ERRORS \ PARA_ERROR(AACDEC_INIT, "failed to init aac decoder"), \ PARA_ERROR(AAC_DECODE, "aac decode error"), \ - #define CHUNK_QUEUE_ERRORS \ PARA_ERROR(QUEUE, "packet queue overrun"), \ -/** \endcond */ +#define INTERACTIVE_ERRORS \ + PARA_ERROR(I9E_EOF, "end of input"), \ + PARA_ERROR(I9E_SETUPTERM, "failed to set up terminal"), \ + PARA_ERROR(I9E_TERM_RQ, "received termination request"), \ + +/** \endcond errors */ /** * The subsystem shift. @@ -494,20 +579,8 @@ extern const char **para_errlist[]; /** Set the osl error bit for the given number. */ #define OSL_ERRNO_TO_PARA_ERROR(num) ((num) | (1 << OSL_ERROR_BIT)) -/** Check whether a given number is a system error number. - * - * \param num The value to be checked. - * \param _errno The system error number. - * - * \return True if \a num is paraslash's representation of the system - * error identified by \a _errno. - */ -_static_inline_ int is_errno(int num, int _errno) -{ - assert(num > 0 && _errno > 0); - return ERRNO_TO_PARA_ERROR(_errno) == num; -} +static const char *weak_osl_strerror(int) __attribute__ ((weakref("osl_strerror"))); /** * Paraslash's version of strerror(3). * @@ -518,12 +591,12 @@ _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_OSL_ERROR(num)) { + assert(weak_osl_strerror); + return weak_osl_strerror(num & ~(1U << OSL_ERROR_BIT)); + } if (IS_SYSTEM_ERROR(num)) - return strerror(num & ((1 << SYSTEM_ERROR_BIT) - 1)); + return strerror(num & ~(1U << SYSTEM_ERROR_BIT)); return para_errlist[ERRNUM_TO_SS(num)][ERRNUM_TO_INDEX(num)]; } @@ -534,7 +607,7 @@ _static_inline_ const char *para_strerror(int num) * * This should be used for all calls to osl functions that return an osl error * code. It changes the return value appropriately so that it can be used for - * printing the correct error message vi para_strerror(). + * printing the correct error message with para_strerror(). * * \return \a ret if \a ret >= 0, a paraslash error code otherwise. */ @@ -547,9 +620,9 @@ _static_inline_ int osl(int ret) /** * Define the error list for one subsystem. - # - * The first entry (index 0) is always the name of the subsystem - * Used by macros in config.h (generated by configure). + * + * The first entry (index 0) is always the name of the subsystem. Used by + * macros in config.h (generated by configure). */ #define DEFINE_ERRLIST(ss) const char * ss ## _ERRLIST[] = {#ss, ss ## _ERRORS}