X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=28ac9552315689124f2bfa1de0e50f874d2e9e61;hp=5307774b3d917d25642bb3ac11a5bb1323228599;hb=bb3daee7cc11561159f168fe4f5427b53e54917f;hpb=8bcf75a3921d15e03c4351b3efa609eac67c3817 diff --git a/error.h b/error.h index 5307774b..28ac9552 100644 --- a/error.h +++ b/error.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2013 Andre Noll + * Copyright (C) 2006 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -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 RBTREE_ERRORS #define RECV_ERRORS #define IPC_ERRORS #define DCCP_SEND_ERRORS @@ -28,26 +26,27 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define GGO_ERRORS #define COLOR_ERRORS #define SIGNAL_ERRORS -#define FADE_ERRORS +#define OSS_MIX_ERRORS #define STDOUT_ERRORS #define FILE_WRITE_ERRORS #define STDIN_ERRORS #define WRITE_ERRORS #define CHECK_WAV_ERRORS -#define OPUSDEC_FILTER_ERRORS -#define OPUS_AFH_ERRORS -#define OPUS_COMMON_ERRORS +#define VERSION_ERRORS +#define SCHED_ERRORS + extern const char **para_errlist[]; -#define OSS_MIX_ERRORS \ - PARA_ERROR(OSS_MIXER_CHANNEL, "invalid mixer channel"), \ +#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_BAD_ELEM, "invalid/unsupported control element"), \ 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 \ @@ -55,6 +54,19 @@ extern const char **para_errlist[]; 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"), \ @@ -63,15 +75,18 @@ extern const char **para_errlist[]; #define PLAY_ERRORS \ PARA_ERROR(PLAY_SYNTAX, "para_play: syntax error"), \ PARA_ERROR(NO_VALID_FILES, "no valid file found in playlist"), \ - PARA_ERROR(TERM_RQ, "user termination request"), \ 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"), \ @@ -146,7 +161,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"), \ @@ -166,10 +180,10 @@ extern const char **para_errlist[]; 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"), \ @@ -195,7 +209,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"), \ @@ -210,7 +223,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 \ @@ -245,7 +257,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 \ @@ -255,7 +266,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"), \ @@ -280,7 +291,6 @@ extern const char **para_errlist[]; #define AUDIOC_ERRORS \ - PARA_ERROR(AUDIOC_SYNTAX, "audioc syntax error"), \ PARA_ERROR(AUDIOC_EOF, "audioc: end of file"), \ @@ -288,15 +298,10 @@ extern const char **para_errlist[]; 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"), \ PARA_ERROR(SERVER_CMD_SUCCESS, "command terminated successfully"), \ PARA_ERROR(SERVER_CMD_FAILURE, "command failed"), \ - - -#define SCHED_ERRORS \ - PARA_ERROR(NOT_INITIALIZED, "scheduler not yet initialized"), \ - PARA_ERROR(SCHED_SHUTDOWN, "scheduler was shut down"), \ + PARA_ERROR(INCOMPAT_FEAT, "client/server incompatibility"), \ #define NET_ERRORS \ @@ -310,7 +315,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"), \ @@ -334,7 +338,9 @@ 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 \ @@ -370,14 +376,12 @@ 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 \ @@ -447,8 +451,6 @@ extern const char **para_errlist[]; 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(MD_OPEN, "could not open message digest object"), \ - PARA_ERROR(CIPHER_OPEN, "could not create stream cipher handle"), \ 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"), \ @@ -466,7 +468,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, "request for unknown or invalid feature"), \ + PARA_ERROR(BAD_FEATURE, "invalid feature request"), \ PARA_ERROR(BAD_AUTH, "authentication failure"), \ @@ -577,7 +579,7 @@ extern const char **para_errlist[]; * \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) +_static_inline_ bool is_errno(int num, int _errno) { assert(num > 0 && _errno > 0); return ERRNO_TO_PARA_ERROR(_errno) == num; @@ -609,7 +611,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. */ @@ -622,9 +624,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}