X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=469b85be0ebd40dc53ab7a9ba93c061b80fe4d62;hp=534e7f97da3afac6ad24c69d5f6f9aec49fc45a6;hb=19d9318abf42debb15d833d4e56ab636893285c3;hpb=51dde9efab2d662cf5813d26d5c9aebce6e197e7 diff --git a/error.h b/error.h index 534e7f97..469b85be 100644 --- a/error.h +++ b/error.h @@ -24,10 +24,9 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define RINGBUFFER_ERRORS #define SCORE_ERRORS #define SHA1_ERRORS -#define RECV_ERRORS #define AFH_COMMON_ERRORS #define RBTREE_ERRORS - +#define RECV_ERRORS extern const char **para_errlist[]; @@ -153,7 +152,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(INPUT_EOF, "end of input"), \ PARA_ERROR(HANDSHAKE_COMPLETE, ""), /* not really an error */ \ @@ -170,7 +168,6 @@ 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 \ @@ -194,12 +191,14 @@ extern const char **para_errlist[]; #define HTTP_RECV_ERRORS \ - PARA_ERROR(HTTP_RECV_EOF, "http_recv: end of file"), \ 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"), \ + PARA_ERROR(RECV_CONNECT, "connection failed"), \ + #define AUDIOD_ERRORS \ @@ -207,6 +206,7 @@ extern const char **para_errlist[]; 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"), \ #define AUDIOD_COMMAND_ERRORS \ @@ -356,7 +356,6 @@ extern const char **para_errlist[]; #define DCCP_RECV_ERRORS \ PARA_ERROR(DCCP_OVERRUN, "dccp output buffer buffer overrun"), \ - PARA_ERROR(DCCP_RECV_EOF, "dccp_recv: end of file"), \ #define DCCP_SEND_ERRORS \ @@ -410,7 +409,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 \