audiod: Fix error message on status errors.

[paraslash.git] / error.h

diff --git a/error.h b/error.h
index 6734040bec1a99f7dda774a9d2655cabef4cac18..82df5ca90d5035c2f458f2b7fbf9f97f55b83334 100644 (file)
--- a/error.h
+++ b/error.h
@@ -35,6 +35,7 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define WRITE_ERRORS
 #define CHECK_WAV_ERRORS
 #define VERSION_ERRORS
+#define SCHED_ERRORS
 
 extern const char **para_errlist[];
 
@@ -75,7 +76,6 @@ extern const char **para_errlist[];
 #define PLAY_ERRORS \
        PARA_ERROR(PLAY_SYNTAX, "para_play: syntax error"), \
        PARA_ERROR(NO_VALID_FILES, "no valid file found in playlist"), \
-       PARA_ERROR(TERM_RQ, "user termination request"), \
        PARA_ERROR(BAD_PLAY_CMD, "invalid command"), \
 
 
@@ -181,7 +181,6 @@ extern const char **para_errlist[];
 
 
 #define COMPRESS_FILTER_ERRORS \
-       PARA_ERROR(COMPRESS_SYNTAX, "syntax error in compress filter config"), \
        PARA_ERROR(COMPRESS_EOF, "compress: end of file"), \
 
 
@@ -222,7 +221,6 @@ 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 \
@@ -292,7 +290,6 @@ extern const char **para_errlist[];
 
 
 #define AUDIOC_ERRORS \
-       PARA_ERROR(AUDIOC_SYNTAX, "audioc syntax error"), \
        PARA_ERROR(AUDIOC_EOF, "audioc: end of file"), \
 
 
@@ -304,11 +301,7 @@ extern const char **para_errlist[];
        PARA_ERROR(SERVER_EOF, "connection closed by para_server"), \
        PARA_ERROR(SERVER_CMD_SUCCESS, "command terminated successfully"), \
        PARA_ERROR(SERVER_CMD_FAILURE, "command failed"), \
-
-
-#define SCHED_ERRORS \
-       PARA_ERROR(NOT_INITIALIZED, "scheduler not yet initialized"), \
-       PARA_ERROR(SCHED_SHUTDOWN, "scheduler was shut down"), \
+       PARA_ERROR(INCOMPAT_FEAT, "client/server incompatibility"), \
 
 
 #define NET_ERRORS \
@@ -322,7 +315,6 @@ extern const char **para_errlist[];
 
 
 #define UDP_RECV_ERRORS \
-       PARA_ERROR(UDP_SYNTAX, "udp_recv syntax error"), \
        PARA_ERROR(UDP_OVERRUN, "output buffer overrun"), \
 
 
@@ -346,7 +338,7 @@ extern const char **para_errlist[];
        PARA_ERROR(UNSUPPORTED_AUDIO_FORMAT, "given audio format not supported"), \
        PARA_ERROR(NOT_PLAYING, "not playing"), \
        PARA_ERROR(AUDIOD_OFF, "audiod switched off"), \
-       PARA_ERROR(STATUS_TIMEOUT, "timeout reading server status"), \
+       PARA_ERROR(STATUS_TIMEOUT, "status item timeout"), \
 
 
 #define AUDIOD_COMMAND_ERRORS \
@@ -382,14 +374,12 @@ extern const char **para_errlist[];
 
 #define MP3DEC_FILTER_ERRORS \
        PARA_ERROR(MAD_FRAME_DECODE, "mad frame decode error"), \
-       PARA_ERROR(MP3DEC_SYNTAX, "syntax error in mp3dec config"), \
        PARA_ERROR(MP3DEC_EOF, "mp3dec: end of file"), \
        PARA_ERROR(MP3DEC_CORRUPT, "too many corrupt frames"), \
 
 
 #define FILTER_ERRORS \
        PARA_ERROR(NO_FILTERS, "at least one filter must be given"), \
-       PARA_ERROR(FILTER_SYNTAX, "syntax error"), \
 
 
 #define STRING_ERRORS \
@@ -459,8 +449,6 @@ extern const char **para_errlist[];
        PARA_ERROR(SEXP_BUILD, "could not build S-expression"), \
        PARA_ERROR(SEXP_ENCRYPT, "could not encrypt S-expression"), \
        PARA_ERROR(SEXP_DECRYPT, "could not decrypt S-expression"), \
-       PARA_ERROR(MD_OPEN, "could not open message digest object"), \
-       PARA_ERROR(CIPHER_OPEN, "could not create stream cipher handle"), \
        PARA_ERROR(BAD_PRIVATE_KEY, "invalid private key"), \
        PARA_ERROR(KEY_MARKER, "invalid/missing key header or footer"), \
        PARA_ERROR(ASN1_PARSE, "could not parse ASN.1 key"), \
@@ -478,7 +466,7 @@ extern const char **para_errlist[];
        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, "auth request for invalid user"), \
-       PARA_ERROR(BAD_FEATURE, "request for unknown or invalid feature"), \
+       PARA_ERROR(BAD_FEATURE, "invalid feature request"), \
        PARA_ERROR(BAD_AUTH, "authentication failure"), \
 
 
@@ -621,7 +609,7 @@ _static_inline_ const char *para_strerror(int num)
  *
  * This should be used for all calls to osl functions that return an osl error
  * code. It changes the return value appropriately so that it can be used for
- * printing the correct error message vi para_strerror().
+ * printing the correct error message with para_strerror().
  *
  * \return \a ret if \a ret >= 0, a paraslash error code otherwise.
  */