/*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
#define TIME_ERRORS
#define CLOSE_ON_FORK_ERRORS
#define DAEMON_ERRORS
-#define UDP_SEND_ERRORS
#define GUI_ERRORS
#define RINGBUFFER_ERRORS
#define SCORE_ERRORS
#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 STDOUT_ERRORS
+#define FILE_WRITE_ERRORS
+#define STDIN_ERRORS
extern const char **para_errlist[];
+#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 \
+ 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"), \
+
+
+#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"), \
+ PARA_ERROR(WMADEC_EOF, "wmadec: end of file"), \
+
+
+#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"), \
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"), \
#define FEC_ERRORS \
#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 \
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"), \
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 OSL_ERRORS \
- PARA_ERROR(BAD_DB_DIR, "invalid database directory"), \
- PARA_ERROR(NO_COLUMN_DESC, "missing column description"), \
- PARA_ERROR(BAD_NAME, "invalid name for a column/table"), \
- PARA_ERROR(BAD_STORAGE_TYPE, "invalid storage type"), \
- PARA_ERROR(BAD_STORAGE_FLAGS, "invalid storage flags"), \
- PARA_ERROR(NO_COLUMN_NAME, "missing column name"), \
- PARA_ERROR(NO_COLUMNS, "at least one column required"), \
- PARA_ERROR(BAD_COLUMN_NAME, "invalid name for a table column"), \
- PARA_ERROR(NO_UNIQUE_RBTREE_COLUMN, "need at least one mapped column with OSL_UNIQE and OSL_RBTREE OSL"), \
- PARA_ERROR(NO_RBTREE_COL, "at least one column needs an rbtree"), \
- PARA_ERROR(DUPLICATE_COL_NAME, "column name given twice"), \
- PARA_ERROR(BAD_STORAGE_SIZE, "invalid storage size"), \
- PARA_ERROR(NO_COMPARE_FUNC, "missing compare function"), \
- PARA_ERROR(BAD_DATA_SIZE, "wrong data size for fixed-size column"), \
- PARA_ERROR(NOT_MAPPED, "file not mapped"), \
- PARA_ERROR(ALREADY_MAPPED, "file already mapped"), \
- PARA_ERROR(BAD_SIZE, "invalid size specified"), \
- PARA_ERROR(TRUNC, "failed to truncate file"), \
- PARA_ERROR(BAD_TABLE, "table not open"), \
- PARA_ERROR(BAD_TABLE_DESC, "invalid table description"), \
- PARA_ERROR(RB_KEY_EXISTS, "key already exists in rbtree"), \
- PARA_ERROR(RB_KEY_NOT_FOUND, "key not found in rbtree"), \
- PARA_ERROR(BAD_ROW_NUM, "invalid row number"), \
- PARA_ERROR(INDEX_CORRUPTION, "index corruption detected"), \
- PARA_ERROR(INVALID_OBJECT, "reference to invalid object"), \
- PARA_ERROR(STAT, "can not stat file"), \
- PARA_ERROR(WRITE, "write error"), \
- PARA_ERROR(LSEEK, "lseek error"), \
- PARA_ERROR(BUSY, "table is busy"), \
- PARA_ERROR(SHORT_TABLE, "table too short"), \
- PARA_ERROR(NO_MAGIC, "missing table header magic"), \
- PARA_ERROR(VERSION_MISMATCH, "table version not supported"), \
- PARA_ERROR(BAD_COLUMN_NUM, "invalid column number"), \
- PARA_ERROR(BAD_TABLE_FLAGS, "invalid flags in table description"), \
- PARA_ERROR(BAD_ROW, "invalid row"), \
-
-
-
#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"), \
#define MOOD_ERRORS \
- PARA_ERROR(MOOD_SYNTAX, "mood syntax error"), \
PARA_ERROR(NO_MOOD, "no mood available"), \
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"), \
#define BLOB_ERRORS \
PARA_ERROR(BLOB_SYNTAX, "blob syntax error"), \
+ PARA_ERROR(INPUT_TOO_LARGE, "input too large for stdin command"), \
#define PLAYLIST_ERRORS \
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"), \
#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"), \
PARA_ERROR(NOT_INITIALIZED, "scheduler not yet initialized"), \
-#define STDIN_ERRORS \
- PARA_ERROR(STDIN_EOF, "end of file"), \
-
-
-
#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(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 \
- 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 \
- 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 \
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 \
- 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 \
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 \
#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 \
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"), \
#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 \
#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"), \
#define ALSA_WRITE_ERRORS \
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"), \
-#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 \
PARA_ERROR(WRITE_COMMON_SYNTAX, "syntax error in write option"), \
#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"), \
#define CHUNK_QUEUE_ERRORS \
*/
#define SYSTEM_ERROR_BIT 30
+/**
+ * Like the SYSTEM_ERROR_BIT, but indicates an error from the osl library.
+ */
+#define OSL_ERROR_BIT 29
+
/** Check whether the system error bit is set. */
#define IS_SYSTEM_ERROR(num) (!!((num) & (1 << SYSTEM_ERROR_BIT)))
+/** Check whether the osl error bit is set. */
+#define IS_OSL_ERROR(num) (!!((num) & (1 << OSL_ERROR_BIT)))
+
/** Set the system error bit for the given number. */
#define ERRNO_TO_PARA_ERROR(num) ((num) | (1 << SYSTEM_ERROR_BIT))
+/** 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.
_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));
- else
- return para_errlist[ERRNUM_TO_SS(num)][ERRNUM_TO_INDEX(num)];
+ return strerror(num & ((1 << SYSTEM_ERROR_BIT) - 1));
+ return para_errlist[ERRNUM_TO_SS(num)][ERRNUM_TO_INDEX(num)];
}
+
+/**
+ * Wrapper for osl library calls.
+ *
+ * \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 appropriately so that it can be used for
+ * printing the correct error message vi para_strerror().
+ *
+ * \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);
+}
+
/**
* Define the error list for one subsystem.
#
projects / paraslash.git / blobdiff