X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=6c35ab4406c335ea2b4122485ed33275c433d28e;hp=c420f490e0b9fc59b27babb2e2f518c1ba3e9260;hb=d7dc81d0994a70e196a861b8ef3c92596f6957ad;hpb=cd0abca282ec1cd29510f4cf8fefb04aa7e20ad7 diff --git a/error.h b/error.h index c420f490..6c35ab44 100644 --- a/error.h +++ b/error.h @@ -70,7 +70,7 @@ 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"), \ @@ -93,12 +93,13 @@ extern const char **para_errlist[]; 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"), \ @@ -113,7 +114,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"), \ @@ -173,34 +174,27 @@ extern const char **para_errlist[]; #define NET_ERRORS \ - PARA_ERROR(SEND, "send 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(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 +255,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"), \ @@ -503,8 +497,8 @@ static inline int is_errno(int val, int _errno) /** * 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). */