X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=error.h;h=20f6b767c91d36c4c9d369438dbdc0f440b5466a;hb=a18295788a381a5083e42fde7d7615b328bb6509;hp=604152233b003e44667f7b69fc2515c74b26f480;hpb=9b5d9adba31e6d42b9dde81fcd3b6f8a0b16bcfc;p=paraslash.git

diff --git a/error.h b/error.h
index 60415223..20f6b767 100644
--- a/error.h
+++ b/error.h
@@ -29,9 +29,20 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define HTTP_SEND_ERRORS
 #define GGO_ERRORS
 #define COLOR_ERRORS
+#define SIGNAL_ERRORS
+
 
 extern const char **para_errlist[];
 
+#define PREBUFFER_FILTER_ERRORS \
+	PARA_ERROR(PREBUFFER_SYNTAX, "syntax error in prebuffer filter config"), \
+
+#define OSS_WRITE_ERRORS \
+	PARA_ERROR(BAD_SAMPLE_FORMAT, "sample format not supported"), \
+	PARA_ERROR(BAD_CHANNEL_COUNT, "channel count not supported"), \
+	PARA_ERROR(BAD_SAMPLERATE, "sample rate not supported"), \
+
+
 #define COMPRESS_FILTER_ERRORS \
 	PARA_ERROR(COMPRESS_SYNTAX, "syntax error in compress filter config"), \
 
@@ -299,10 +310,6 @@ extern const char **para_errlist[];
 	PARA_ERROR(FILTER_SYNTAX, "syntax error"), \
 
 
-#define SIGNAL_ERRORS \
-	PARA_ERROR(SIGNAL_SIG_ERR, "signal() returned SIG_ERR"), \
-
-
 #define STRING_ERRORS \
 	PARA_ERROR(ATOI_OVERFLOW, "value too large"), \
 	PARA_ERROR(STRTOLL, "unknown strtoll error"), \
@@ -361,14 +368,15 @@ extern const char **para_errlist[];
 
 #define COMMAND_ERRORS \
 	PARA_ERROR(COMMAND_SYNTAX, "syntax error in command"), \
-	PARA_ERROR(AUTH, "did not receive auth request"), \
+	PARA_ERROR(AUTH_REQUEST, "did not receive auth request"), \
 	PARA_ERROR(NO_AUDIO_FILE, "no audio file"), \
 	PARA_ERROR(BAD_CMD, "invalid command"), \
 	PARA_ERROR(PERM, "permission denied"), \
 	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."), \
+	PARA_ERROR(BAD_USER, "auth request for invalid user"), \
+	PARA_ERROR(BAD_AUTH, "authentication failure"), \
 
 
 #define DCCP_RECV_ERRORS \