X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=55bd3ba6b7a698f3d9370c9b24af67411daa4a3e;hp=87985dc6f477ddec7f1abe9a52682dcf8d10f60a;hb=cf749f79f1c353cc5aac1013aeef5ed0eb0f63ee;hpb=7f053695dcb0ab70745a457048e6fb0b83d75d47 diff --git a/error.h b/error.h index 87985dc6..55bd3ba6 100644 --- a/error.h +++ b/error.h @@ -1,82 +1,15 @@ /* - * Copyright (C) 2006-2007 Andre Noll + * Copyright (C) 2006-2008 Andre Noll * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ -/** \file error.h list of error messages for all subsystems */ - -/** \cond list of all subsystems that support the shiny error facility */ -enum para_subsystem { - SS_CLIENT, - SS_GUI, - SS_TIME, - SS_WAV, - SS_COMPRESS, - SS_CLOSE_ON_FORK, - SS_DAEMON, - SS_DCCP_SEND, - SS_RINGBUFFER, - SS_RECV, - SS_NET, - SS_ORTP_RECV, - SS_CLIENT_COMMON, - SS_AUDIOC, - SS_SCHED, - SS_AUDIOD, - SS_AUDIOD_COMMAND, - SS_EXEC, - SS_STDIN, - SS_STDOUT, - SS_SIGNAL, - SS_STRING, - SS_STAT, - SS_GRAB_CLIENT, - SS_HTTP_RECV, - SS_RECV_COMMON, - SS_FILTER_CHAIN, - SS_OGGDEC, - SS_FILTER, - SS_COMMAND, - SS_RANDOM_SELECTOR, - SS_PLAYLIST_SELECTOR, - SS_CRYPT, - SS_HTTP_SEND, - SS_ORTP_SEND, - SS_AFS, - SS_OGG_AFH, - SS_MP3_AFH, - SS_AAC_AFH, - SS_MP3DEC, - SS_AACDEC, - SS_AAC_COMMON, - SS_SERVER, - SS_VSS, - SS_MYSQL_SELECTOR, - SS_IPC, - SS_DCCP, - SS_DCCP_RECV, - SS_FD, - SS_WRITE, - SS_WRITE_COMMON, - SS_ALSA_WRITE, - SS_FILE_WRITE, - SS_OSX_WRITE, - SS_USER_LIST, - NUM_SS -}; +/** \file error.h List of error messages for all subsystems. */ + +/** \cond */ + +/* List of all subsystems that use paraslash's error facility. */ +DEFINE_ERRLIST_OBJECT_ENUM; /* these do not need error handling (yet) */ #define SERVER_ERRORS @@ -89,11 +22,109 @@ enum para_subsystem { #define ORTP_SEND_ERRORS #define GUI_ERRORS #define RINGBUFFER_ERRORS +#define SCORE_ERRORS +#define SHA1_ERRORS +#define AFH_COMMON_ERRORS +#define RBTREE_ERRORS +#define RECV_ERRORS +#define SEND_COMMON_ERRORS +extern const char **para_errlist[]; +#define ACL_ERRORS \ + 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_PARENT_DIED, "fatal: server process terminated"), \ + 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(NOT_ADMISSIBLE, "file is not admissible"), \ + + +#define ATTRIBUTE_ERRORS \ + PARA_ERROR(ATTR_SYNTAX, "attribute syntax error"), \ + PARA_ERROR(NO_ATTRIBUTES, "no attributes defined yet"), \ + PARA_ERROR(ATT_TABLE_FULL, "no more space left in attribute table"), \ + + +#define BLOB_ERRORS \ + PARA_ERROR(BLOB_SYNTAX, "blob syntax error"), \ + PARA_ERROR(DUMMY_ROW, "attempted to access blob dummy object"), \ + + +#define PLAYLIST_ERRORS \ + PARA_ERROR(PLAYLIST_LOADED, ""), /* not really an error */ \ + PARA_ERROR(PATH_FOUND, ""), /* not really an error */ \ + PARA_ERROR(PLAYLIST_EMPTY, "attempted to load empty playlist"), \ + + +#define AFT_ERRORS \ + PARA_ERROR(BAD_AFSI, "invaiid afs info"), \ + PARA_ERROR(LOCALTIME, "localtime() failed"), \ + PARA_ERROR(STRFTIME, "strftime() failed"), \ + 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"), \ -extern const char **para_errlist[]; -/** \endcond */ #define USER_LIST_ERRORS \ PARA_ERROR(USERLIST, "failed to open user list file"), \ @@ -102,7 +133,6 @@ extern const char **para_errlist[]; #define OSX_WRITE_ERRORS \ PARA_ERROR(STREAM_FORMAT, "could not set stream format"), \ PARA_ERROR(ADD_CALLBACK, "can not add callback"), \ - PARA_ERROR(READ_STDIN, "failed to read from stdin"), \ PARA_ERROR(OPEN_COMP, "OpenAComponent() error"), \ PARA_ERROR(UNIT_INIT, "AudioUnitInitialize() error"), \ PARA_ERROR(UNIT_START, "AudioUnitStart() error"), \ @@ -113,20 +143,15 @@ extern const char **para_errlist[]; PARA_ERROR(AUDIOC_SYNTAX, "audioc syntax error"), \ PARA_ERROR(AUDIOC_READ, "audioc read error"), \ PARA_ERROR(AUDIOC_WRITE, "audioc write error"), \ - PARA_ERROR(INIT_SOCK_ADDR, "can not init socket"), \ - PARA_ERROR(AUDIOC_CONNECT, "audioc connect 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(CLIENT_AUTH, "authentication failed"), \ PARA_ERROR(SERVER_EOF, "connection closed by para_server"), \ - PARA_ERROR(INPUT_EOF, "end of input"), \ PARA_ERROR(HANDSHAKE_COMPLETE, ""), /* not really an error */ \ @@ -143,58 +168,42 @@ extern const char **para_errlist[]; #define STDOUT_ERRORS \ PARA_ERROR(STDOUT_WRITE, "failed to write to stdout"), \ - PARA_ERROR(STDOUT_EOF, "end of file"), \ #define NET_ERRORS \ - PARA_ERROR(SEND, "send error"), \ - PARA_ERROR(RECV, "receive error"), \ - PARA_ERROR(SOCKET, "socket error"), \ - PARA_ERROR(CONNECT, "connect error"), \ - PARA_ERROR(ACCEPT, "accept error"), \ - PARA_ERROR(SETSOCKOPT, "failed to set socket options"), \ - PARA_ERROR(BIND, "bind error"), \ PARA_ERROR(NAME_TOO_LONG, "name too long for struct sockaddr_un"), \ + PARA_ERROR(ADDRESS_LOOKUP, "address lookup / socket creation failed"), \ 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(LISTEN, "listen error"), \ PARA_ERROR(RECV_PATTERN, "did not receive expected pattern"), \ - PARA_ERROR(HOST_INFO, "gethostbyname() failed"), \ #define ORTP_RECV_ERRORS \ PARA_ERROR(MSG_TO_BUF, "failed to extract rtp packet"), \ - PARA_ERROR(ORTP_SYNTAX, "ottp syntax error"), \ + PARA_ERROR(ORTP_SYNTAX, "ortp syntax error"), \ PARA_ERROR(TOO_MANY_BAD_CHUNKS, "too many consecutive bad chunks"), \ PARA_ERROR(INVALID_HEADER, "invalid header packet"), \ - PARA_ERROR(OVERRUN, "outout buffer overrun"), \ + PARA_ERROR(OVERRUN, "output buffer overrun"), \ PARA_ERROR(ORTP_RECV_EOF, "ortp_recv: end of file"), \ #define HTTP_RECV_ERRORS \ - PARA_ERROR(SEND_HTTP_REQUEST, "failed to send http request"), \ - PARA_ERROR(MISSING_OK, "did not receive OK message from peer"), \ - PARA_ERROR(HTTP_RECV_BUF, "did not receive buffer"), \ - PARA_ERROR(HTTP_RECV_EOF, "http_recv: end of file"), \ - - -#define RECV_ERRORS \ - PARA_ERROR(RECV_SELECT, "recv select error"), \ - PARA_ERROR(WRITE_STDOUT, "stdout write error"), \ + PARA_ERROR(HTTP_RECV_OVERRUN, "http_recv: output buffer overrun"), \ #define RECV_COMMON_ERRORS \ PARA_ERROR(RECV_SYNTAX, "recv syntax error"), \ + PARA_ERROR(RECV_EOF, "end of file"), \ #define AUDIOD_ERRORS \ - PARA_ERROR(WRITE_AUDIO_DATA, "failed to write audio data"), \ PARA_ERROR(NO_MORE_SLOTS, "no more empty slots"), \ PARA_ERROR(MISSING_COLON, "syntax error: missing colon"), \ PARA_ERROR(UNSUPPORTED_AUDIO_FORMAT, "given audio format not supported"), \ - PARA_ERROR(STATUS_EOF, "server closed status connection"), \ + PARA_ERROR(SIGNAL_CAUGHT, "caught signal"), \ + PARA_ERROR(NOT_PLAYING, "not playing"), \ #define AUDIOD_COMMAND_ERRORS \ @@ -245,16 +254,15 @@ extern const char **para_errlist[]; #define SIGNAL_ERRORS \ - PARA_ERROR(SIGNAL_SIG_ERR, "signal() retured SIG_ERR"), \ + PARA_ERROR(SIGNAL_SIG_ERR, "signal() returned SIG_ERR"), \ PARA_ERROR(SIGNAL_READ, "read error from signal pipe"), \ - PARA_ERROR(WAITPID, "waitpid error"), \ - PARA_ERROR(SIGNAL_PIPE, "failed to setup signal pipe"), \ - PARA_ERROR(SIGNAL_CAUGHT, "caught signal"), \ #define STRING_ERRORS \ - PARA_ERROR(MKSTEMP, "mkstemp error: unable to create tmp file"), \ - PARA_ERROR(FCHMOD, "fchmod error: can not set mode"), \ + 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"), \ #define EXEC_ERRORS \ @@ -265,9 +273,7 @@ extern const char **para_errlist[]; #define MP3_AFH_ERRORS \ PARA_ERROR(FRAME, "invalid mp3 frame"), \ PARA_ERROR(FRAME_LENGTH, "invalid frame length"), \ - PARA_ERROR(MP3_NO_FILE, "invalid mp3 file pointer"), \ PARA_ERROR(MP3_INFO, "could not read mp3 info"), \ - PARA_ERROR(MP3_REPOS, "mp3 repositioning error"), \ PARA_ERROR(HEADER_FREQ, "invalid header frequency"), \ PARA_ERROR(HEADER_BITRATE, "invalid header bitrate"), \ @@ -275,6 +281,7 @@ extern const char **para_errlist[]; #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"), \ #define AAC_COMMON_ERRORS \ @@ -288,23 +295,17 @@ extern const char **para_errlist[]; 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_NO_FILE, "invalid ogg file pointer"), \ - PARA_ERROR(OGG_OPEN, "ov_open error"), \ PARA_ERROR(OGG_INFO, "ov_info error"), \ - PARA_ERROR(OGG_REPOS, "ogg repositioning 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"), \ #define VSS_ERRORS \ + PARA_ERROR(BAD_AUDIO_FILE_SUFFIX, "unknown suffix"), \ PARA_ERROR(AUDIO_FORMAT, "audio format not recognized"), \ - PARA_ERROR(FSTAT, "failed to fstat() audio file"), \ - PARA_ERROR(EMPTY_CHUNK, "empty chunk"), \ - - -#define AFS_ERRORS \ - PARA_ERROR(GETCWD, "can not get current working directory"), \ - PARA_ERROR(CHDIR, "can not change directory"), \ - PARA_ERROR(OPENDIR, "can not open directory"), \ - PARA_ERROR(LSTAT, "lstat error"), \ + PARA_ERROR(CHUNK, "unable to get chunk"), \ + PARA_ERROR(NOFD, "did not receive open fd from afs"), \ #define CRYPT_ERRORS \ @@ -317,41 +318,12 @@ extern const char **para_errlist[]; #define HTTP_SEND_ERRORS \ - PARA_ERROR(QUEUE, "packet queue overrun"), \ - PARA_ERROR(WRITE_OK, "can not check whether fd is writable"), \ - - -#define RANDOM_SELECTOR_ERRORS \ - PARA_ERROR(NOTHING_FOUND, "no audio files found"), \ - - -#define MYSQL_SELECTOR_ERRORS \ - PARA_ERROR(MYSQL_SYNTAX, "mysql syntax error"), \ - PARA_ERROR(NOTCONN, "not connected to mysql server"), \ - PARA_ERROR(TOOBIG, "mysql: file too large"), \ - PARA_ERROR(NAMETOOLONG, "mysql: name too long"), \ - PARA_ERROR(QFAILED, "mysql query failed"), \ - PARA_ERROR(NOROW, "row is NULL"), \ - PARA_ERROR(NOATTS, "can not get attributes from mysql table"), \ - PARA_ERROR(NORESULT, "error while fetching mysql result"), \ - PARA_ERROR(EMPTY_RESULT, "result is empty"), \ - PARA_ERROR(ESCAPE, "can not escape string"), \ - PARA_ERROR(GET_AUDIO_FILE, "can not get current audio file"), \ - PARA_ERROR(GET_STREAM, "can not get current stream"), \ - PARA_ERROR(NO_STREAM, "no such stream"), \ - PARA_ERROR(AUDIO_FILE, "no such audio file"), \ - PARA_ERROR(GET_QUERY, "can not get query for specified stream"), \ - PARA_ERROR(TMPFILE, "error while writing temporary file"), \ - PARA_ERROR(META, "can not get meta data"), \ - PARA_ERROR(MYSQL_INIT, "can not initialize mysql connection"), \ - PARA_ERROR(NO_MYSQL_PASSWD, "fatal: no mysql passord given"), \ - PARA_ERROR(NO_AF_DIR, "fatal: audio file directory not given"), \ + PARA_ERROR(MAX_CLIENTS, "maximal number of clients exceeded"), \ #define COMMAND_ERRORS \ PARA_ERROR(COMMAND_SYNTAX, "syntax error in command"), \ PARA_ERROR(AUTH, "did not receive auth request"), \ - PARA_ERROR(BAD_SELECTOR, "no such audio file selector"), \ PARA_ERROR(NO_AUDIO_FILE, "no audio file"), \ PARA_ERROR(BAD_CMD, "invalid command"), \ PARA_ERROR(PERM, "permission denied"), \ @@ -361,10 +333,6 @@ extern const char **para_errlist[]; PARA_ERROR(BAD_USER, "you don't exist. Go away."), \ -#define PLAYLIST_SELECTOR_ERRORS \ - PARA_ERROR(LOAD_PLAYLIST, "failed to load playlist"), \ - - #define IPC_ERRORS \ PARA_ERROR(SEM_GET, "failed to create semaphore"), \ PARA_ERROR(SEM_REMOVE, "can not remove semaphore"), \ @@ -374,29 +342,18 @@ extern const char **para_errlist[]; PARA_ERROR(SHM_DETACH, "can not detach shared memory area"), \ -#define DCCP_ERRORS \ - PARA_ERROR(DCCP_SOCKET, "can not create dccp socket"), \ - PARA_ERROR(DCCP_RECV_EOF, "dccp_recv: end of file"), \ - - #define DCCP_RECV_ERRORS \ - PARA_ERROR(ADDR_INFO, "getaddrinfo error"), \ PARA_ERROR(DCCP_OVERRUN, "dccp output buffer buffer overrun"), \ - PARA_ERROR(DCCP_CONNECT, "dccp connect error"), \ #define DCCP_SEND_ERRORS \ - PARA_ERROR(DCCP_BIND, "dccp bind error"), \ - PARA_ERROR(DCCP_LISTEN, "dccp listen error"), \ - PARA_ERROR(DCCP_WRITE, "dccp write error"), \ #define FD_ERRORS \ - PARA_ERROR(F_GETFL, "failed to get fd flags"), \ - PARA_ERROR(F_SETFL, "failed to set fd flags"), \ PARA_ERROR(FGETS, "fgets error"), \ - PARA_ERROR(FSEEK, "fseek error"), \ - PARA_ERROR(FREAD, "fread error"), \ + PARA_ERROR(EMPTY, "file empty"), \ + PARA_ERROR(MMAP, "mmap error"), \ + PARA_ERROR(MUNMAP, "munmap failed"), \ #define WRITE_ERRORS \ @@ -416,8 +373,6 @@ extern const char **para_errlist[]; PARA_ERROR(HW_PARAMS, "unable to install hw params"), \ PARA_ERROR(SW_PARAMS, "unable to install sw params"), \ PARA_ERROR(BAD_PERIOD, "can not use period equal to buffer size"), \ - PARA_ERROR(GET_XFER, "unable to obtain xfer align"), \ - PARA_ERROR(SET_XFER, "snd_pcm_sw_params_set_xfer_align() failed"), \ PARA_ERROR(ALSA_WRITE, "alsa write error"), \ PARA_ERROR(PCM_OPEN, "unable to open pcm"), \ PARA_ERROR(SND_PCM_INFO, "pcm info error"), \ @@ -436,7 +391,6 @@ extern const char **para_errlist[]; #define WRITE_COMMON_ERRORS \ PARA_ERROR(WRITE_COMMON_SYNTAX, "syntax error in write option"), \ - PARA_ERROR(WNG_EOF, "wng: end of file"), \ #define AACDEC_ERRORS \ @@ -445,23 +399,29 @@ extern const char **para_errlist[]; PARA_ERROR(AAC_OVERRUN, "aac output buffer overrun"), \ +#define CHUNK_QUEUE_ERRORS \ + PARA_ERROR(QUEUE, "packet queue overrun"), \ + + +/** \endcond */ + /** - * the subsystem shift + * The subsystem shift. * * 255 error codes ought to be enough for every subsystem. Use the higher bits - * of the return value to encode the subsystem number + * of the return value to encode the subsystem number. */ #define SS_SHIFT 8 /** - * compute the subsystem offset + * Compute the subsystem offset. * - * It is given by x * 2**8 where \a x is the subsystem number + * It is given by x * 2**8 where \a x is the subsystem number. */ #define SS_OFFSET(ss) (SS_ ## ss << SS_SHIFT) /** - * make the enum of all errors of one subsystem + * Make the enum of all errors of one subsystem. * * As zero should not be an error, we define a dummy enum entry with value * 2**ss. That lets the real errors start at 2**ss + 1. @@ -471,39 +431,74 @@ extern const char **para_errlist[]; ss ## _ERRORS} /** - * determine the subsystem number from the error number + * Determine the subsystem number from the error number. * * Easy, it's just \a num / 2**8. */ #define ERRNUM_TO_SS(num) ((num) >> SS_SHIFT) /** - * determine the index of an error number + * Determine the index of an error number. * * Also easy: It's the lower 8 bits of num. */ #define ERRNUM_TO_INDEX(num) (((1 << SS_SHIFT) - 1) & (num)) /** - * paraslash's version of strerror(3) + * This bit indicates whether a number is considered a system error number + * If yes, the system errno is just the result of clearing this bit from + * the given number. + */ +#define SYSTEM_ERROR_BIT 30 + +/** Check whether the system error bit is set. */ +#define IS_SYSTEM_ERROR(num) (!!((num) & (1 << SYSTEM_ERROR_BIT))) + +/** Set the system error bit for the given number. */ +#define ERRNO_TO_PARA_ERROR(num) ((num) | (1 << SYSTEM_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. * - * expands to the error text of \a num (a string constant). + * \return True if \a num is paraslash's representation of the system + * error identified by \a _errno. */ -#define PARA_STRERROR(num) para_errlist[ERRNUM_TO_SS(num)] [ERRNUM_TO_INDEX(num)] +_static_inline_ int is_errno(int num, int _errno) +{ + assert(num > 0 && _errno > 0); + return ERRNO_TO_PARA_ERROR(_errno) == num; +} /** - * define the error list for one subsystem + * Paraslash's version of strerror(3). + * + * \param num The error number. + * + * \return The error text of \a num. + */ +_static_inline_ const char *para_strerror(int num) +{ + assert(num > 0); + 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)]; +} +/** + * 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) + * Used by macros in config.h (generated by configure). */ #define DEFINE_ERRLIST(ss) const char * ss ## _ERRLIST[] = {#ss, ss ## _ERRORS} /** - * activate errors for one subsystem. + * Activate errors for one subsystem. * - * Each executable needs only the error lists of those subssystems it is - * actually linked with. We always reserve space for NUM_SS char ** pointers, + * Each executable needs only the error lists of those subsystems it is + * actually linked with. We always reserve space for NUM_SS char pointers, * but only init those of the needed subsystems. This macro is used by macros * in config.h (generated by configure). */ @@ -514,66 +509,7 @@ extern const char **para_errlist[]; * 'E_') and gets later redefined to expand to the error text only */ #define PARA_ERROR(err, msg) E_ ## err - -// #define SS_NAME(ss) para_errlist[ss]? para_errlist[ss][0] : "" - -/** \cond popcorn time */ -SS_ENUM(GUI); -SS_ENUM(SCHED); -SS_ENUM(STDIN); -SS_ENUM(STDOUT); -SS_ENUM(WAV); -SS_ENUM(COMPRESS); -SS_ENUM(TIME); -SS_ENUM(CLOSE_ON_FORK); -SS_ENUM(ORTP_RECV); -SS_ENUM(NET); -SS_ENUM(RECV); -SS_ENUM(AUDIOD); -SS_ENUM(AUDIOD_COMMAND); -SS_ENUM(EXEC); -SS_ENUM(SIGNAL); -SS_ENUM(STRING); -SS_ENUM(DAEMON); -SS_ENUM(STAT); -SS_ENUM(GRAB_CLIENT); -SS_ENUM(HTTP_RECV); -SS_ENUM(RECV_COMMON); -SS_ENUM(FILTER_CHAIN); -SS_ENUM(OGGDEC); -SS_ENUM(MP3DEC); -SS_ENUM(AACDEC); -SS_ENUM(FILTER); -SS_ENUM(MP3_AFH); -SS_ENUM(OGG_AFH); -SS_ENUM(AAC_AFH); -SS_ENUM(AAC_COMMON); -SS_ENUM(SERVER); -SS_ENUM(VSS); -SS_ENUM(COMMAND); -SS_ENUM(RANDOM_SELECTOR); -SS_ENUM(PLAYLIST_SELECTOR); -SS_ENUM(CRYPT); -SS_ENUM(HTTP_SEND); -SS_ENUM(ORTP_SEND); -SS_ENUM(AFS); -SS_ENUM(MYSQL_SELECTOR); -SS_ENUM(IPC); -SS_ENUM(DCCP); -SS_ENUM(DCCP_RECV); -SS_ENUM(DCCP_SEND); -SS_ENUM(FD); -SS_ENUM(WRITE); -SS_ENUM(WRITE_COMMON); -SS_ENUM(ALSA_WRITE); -SS_ENUM(FILE_WRITE); -SS_ENUM(OSX_WRITE); -SS_ENUM(RINGBUFFER); -SS_ENUM(CLIENT); -SS_ENUM(CLIENT_COMMON); -SS_ENUM(AUDIOC); -SS_ENUM(USER_LIST); -/** \endcond */ +#include "error2.h" #undef PARA_ERROR -/* rest of the world only sees the error text */ +/* Rest of the world only sees the error text. */ #define PARA_ERROR(err, msg) msg