X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=fada9b30b9ca054115a7e4a811c65db2dfbb7bd2;hp=f1a3e41dd7ef84b54280b54d3a759a08e4397845;hb=7f9340341574044e16e1ffc30f856f13d1e3ba6c;hpb=7d912dbad687503f2a8d4895b0e48b4584b4940b diff --git a/error.h b/error.h index f1a3e41d..fada9b30 100644 --- a/error.h +++ b/error.h @@ -4,11 +4,11 @@ * Licensed under the GPL v2. For licencing details see COPYING. */ -/** \file error.h list of error messages for all subsystems */ +/** \file error.h List of error messages for all subsystems. */ /** \cond */ -/* list of all subsystems that use paraslash's error facility */ +/* List of all subsystems that use paraslash's error facility. */ DEFINE_ERRLIST_OBJECT_ENUM; /* these do not need error handling (yet) */ @@ -26,6 +26,8 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define SHA1_ERRORS #define RECV_ERRORS #define AFH_COMMON_ERRORS +#define RBTREE_ERRORS + extern const char **para_errlist[]; @@ -70,14 +72,12 @@ extern const char **para_errlist[]; 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 suppoerted"), \ + 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 RBTREE_ERRORS \ - #define AFS_ERRORS \ PARA_ERROR(BAD_TABLE_NAME, "invalid table"), \ @@ -86,18 +86,21 @@ extern const char **para_errlist[]; 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(MOOD_LOADED, "mood loaded"), \ - PARA_ERROR(NOT_ADMISSIBLE, "file is not admussible"), \ + 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"), \ @@ -112,7 +115,7 @@ extern const char **para_errlist[]; #define AFT_ERRORS \ - PARA_ERROR(BAD_AFSI, "invaid afs info"), \ + PARA_ERROR(BAD_AFSI, "invaiid afs info"), \ PARA_ERROR(LOCALTIME, "localtime() failed"), \ PARA_ERROR(STRFTIME, "strftime() failed"), \ PARA_ERROR(BAD_PATH, "invalid path"), \ @@ -144,7 +147,6 @@ extern const char **para_errlist[]; 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"), \ @@ -172,35 +174,29 @@ extern const char **para_errlist[]; #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(HTTP_RECV_EOF, "http_recv: end of file"), \ - PARA_ERROR(HTTP_RECV_OVERRUN, "http_recv: outout buffer overrun"), \ + PARA_ERROR(HTTP_RECV_OVERRUN, "http_recv: output buffer overrun"), \ + #define RECV_COMMON_ERRORS \ PARA_ERROR(RECV_SYNTAX, "recv syntax error"), \ @@ -261,7 +257,7 @@ 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"), \ @@ -430,25 +426,26 @@ extern const char **para_errlist[]; #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. @@ -458,14 +455,14 @@ 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. */ @@ -484,27 +481,27 @@ static inline int is_errno(int val, int _errno) } /** - * paraslash's version of strerror(3) + * Paraslash's version of strerror(3). * - * expands to the error text of \a num (a string constant). + * Expands to the error text of \a num (a string constant). */ #define PARA_STRERROR(num) IS_SYSTEM_ERROR(num)? \ strerror((num) & ((1 << SYSTEM_ERROR_BIT) - 1)) : \ para_errlist[ERRNUM_TO_SS(num)] [ERRNUM_TO_INDEX(num)] /** - * define the error list for one subsystem + * 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). */ @@ -517,5 +514,5 @@ static inline int is_errno(int val, int _errno) #define PARA_ERROR(err, msg) E_ ## err #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