X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=c2f993d0bd8707f8c4efe2a4d7d48147ed9df438;hp=55bd3ba6b7a698f3d9370c9b24af67411daa4a3e;hb=e6940831fbcf21dd0e6243ca89ea0c7f8b195d9e;hpb=bef59e08d8c68168b062aff513cf8dfacdaa25d3

diff --git a/error.h b/error.h
index 55bd3ba6..c2f993d0 100644
--- a/error.h
+++ b/error.h
@@ -24,13 +24,23 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define RINGBUFFER_ERRORS
 #define SCORE_ERRORS
 #define SHA1_ERRORS
-#define AFH_COMMON_ERRORS
 #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(AUDIO_FORMAT, "audio format not recognized"), \
+
+
 #define ACL_ERRORS \
 	PARA_ERROR(ACL_PERM, "access denied by acl"), \
 
@@ -152,23 +162,19 @@ 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 \
 	PARA_ERROR(TASK_KILLED, "task killed"), \
+	PARA_ERROR(TASK_UNREGISTERED, "task has been unscheduled"), \
 	PARA_ERROR(NO_SUCH_TASK, "task not found"), \
 	PARA_ERROR(NOT_INITIALIZED, "scheduler not yet initialized"), \
 
 
 #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"), \
@@ -202,7 +208,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"), \
 
 
@@ -255,7 +260,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 \
@@ -302,8 +306,6 @@ extern const char **para_errlist[];
 
 
 #define VSS_ERRORS \
-	PARA_ERROR(BAD_AUDIO_FILE_SUFFIX, "unknown suffix"), \
-	PARA_ERROR(AUDIO_FORMAT, "audio format not recognized"), \
 	PARA_ERROR(CHUNK, "unable to get chunk"), \
 	PARA_ERROR(NOFD, "did not receive open fd from afs"), \
 
@@ -358,7 +360,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"), \