Merge /fml/ag-raetsch/home/maan/scm/paraslash_meins/paraslash

[paraslash.git] / error.h

diff --git a/error.h b/error.h
index e1007fd31f64a9f47b1aa33055dadadff5f589fc..318448666fb4ea30a7835858b205a60ba89936b5 100644 (file)
--- a/error.h
+++ b/error.h
@@ -102,7 +102,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"), \
@@ -119,7 +118,6 @@ extern const char **para_errlist[];
 
 
 
-
 #define CLIENT_COMMON_ERRORS \
        PARA_ERROR(CLIENT_SYNTAX, "syntax error"), \
        PARA_ERROR(INVALID_CHALLENGE, "did not receive valid challenge"), \
@@ -174,27 +172,22 @@ extern const char **para_errlist[];
 
 
 #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"), \
+       PARA_ERROR(HTTP_RECV_OVERRUN, "http_recv: outout buffer overrun"), \
 
 
 #define RECV_ERRORS \
-       PARA_ERROR(RECV_SELECT, "recv select error"), \
-       PARA_ERROR(WRITE_STDOUT, "stdout write error"), \
+       PARA_ERROR(RECV_SYNTAX, "recv syntax error"), \
 
 
 #define RECV_COMMON_ERRORS \
-       PARA_ERROR(RECV_SYNTAX, "recv syntax error"), \
 
 
 #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"), \
 
 
 #define AUDIOD_COMMAND_ERRORS \
@@ -202,7 +195,6 @@ extern const char **para_errlist[];
        PARA_ERROR(AUDIOD_SYNTAX, "syntax error"), \
        PARA_ERROR(UCRED_PERM, "permission denied"), \
        PARA_ERROR(INVALID_AUDIOD_CMD, "invalid command"), \
-       PARA_ERROR(BAD_USER, "you don't exist. Go away."), \
 
 
 #define FILTER_CHAIN_ERRORS \
@@ -250,7 +242,6 @@ extern const char **para_errlist[];
        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 \
@@ -266,19 +257,15 @@ 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"), \
 
 
 #define AAC_AFH_ERRORS \
-       PARA_ERROR(AAC_REPOS, "aac repositioning error"), \
-       PARA_ERROR(AAC_READ, "aac read error"), \
        PARA_ERROR(STSZ, "did not find stcz atom"), \
        PARA_ERROR(MP4ASC, "audio spec config error"), \
-       PARA_ERROR(AAC_OVERRUN, "aac output buffer overrun"), \
+       PARA_ERROR(AAC_AFH_INIT, "failed to init aac decoder"), \
 
 
 #define AAC_COMMON_ERRORS \
@@ -292,16 +279,14 @@ 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(AUDIO_FORMAT, "audio format not recognized"), \
-       PARA_ERROR(FSTAT, "failed to fstat() audio file"), \
-       PARA_ERROR(EMPTY_CHUNK, "empty chunk"), \
 
 
 #define AFS_ERRORS \
@@ -362,6 +347,7 @@ extern const char **para_errlist[];
        PARA_ERROR(LOCK, "lock error"), \
        PARA_ERROR(SENDER_CMD, "command not supported by this sender"), \
        PARA_ERROR(SERVER_CRASH, "para_server crashed -- can not live without it"), \
+       PARA_ERROR(BAD_USER, "you don't exist. Go away."), \
 
 
 #define PLAYLIST_SELECTOR_ERRORS \
@@ -379,13 +365,13 @@ extern const char **para_errlist[];
 
 #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"), \
+       PARA_ERROR(DCCP_RECV_EOF, "dccp_recv: end of file"), \
 
 
 #define DCCP_SEND_ERRORS \
@@ -398,8 +384,6 @@ extern const char **para_errlist[];
        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"), \
 
 
 #define WRITE_ERRORS \
@@ -445,6 +429,7 @@ extern const char **para_errlist[];
 #define AACDEC_ERRORS \
        PARA_ERROR(AACDEC_INIT, "failed to init aac decoder"), \
        PARA_ERROR(AAC_DECODE, "aac decode error"), \
+       PARA_ERROR(AAC_OVERRUN, "aac output buffer overrun"), \
 
 
 /**