X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=error.h;h=6b8403d1a91c3fd67e2a73f5e971f07896970e43;hb=b0751efcbff9e9c3e7721cf5dcbc0848575e3da5;hp=994ec1ba2c75c56b8f0acb9fe576c11213556244;hpb=d0ca43932625771467cf462981ea244a47da251b;p=paraslash.git diff --git a/error.h b/error.h index 994ec1ba..6b8403d1 100644 --- a/error.h +++ b/error.h @@ -27,15 +27,17 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define RBTREE_ERRORS #define RECV_ERRORS #define SEND_COMMON_ERRORS +#define STDOUT_ERRORS + 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 \ - PARA_ERROR(BAD_AUDIO_FILE_SUFFIX, "unknown suffix"), \ PARA_ERROR(AUDIO_FORMAT, "audio format not recognized"), \ @@ -160,7 +162,6 @@ extern const char **para_errlist[]; 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(HANDSHAKE_COMPLETE, ""), /* not really an error */ \ #define SCHED_ERRORS \ @@ -170,13 +171,9 @@ extern const char **para_errlist[]; #define STDIN_ERRORS \ - PARA_ERROR(STDIN_READ, "failed to read from stdin"), \ PARA_ERROR(STDIN_EOF, "end of file"), \ -#define STDOUT_ERRORS \ - PARA_ERROR(STDOUT_WRITE, "failed to write to stdout"), \ - #define NET_ERRORS \ PARA_ERROR(NAME_TOO_LONG, "name too long for struct sockaddr_un"), \ @@ -210,7 +207,6 @@ extern const char **para_errlist[]; 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(SIGNAL_CAUGHT, "caught signal"), \ PARA_ERROR(NOT_PLAYING, "not playing"), \ @@ -263,7 +259,6 @@ extern const char **para_errlist[]; #define SIGNAL_ERRORS \ PARA_ERROR(SIGNAL_SIG_ERR, "signal() returned SIG_ERR"), \ - PARA_ERROR(SIGNAL_READ, "read error from signal pipe"), \ #define STRING_ERRORS \ @@ -364,7 +359,6 @@ extern const char **para_errlist[]; #define WRITE_ERRORS \ PARA_ERROR(WRITE_SYNTAX, "para_write syntax error"), \ - PARA_ERROR(PREMATURE_END, "premature end of audio file"), \ 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"), \