Grab cleanups and fixes.

[paraslash.git] / error.h

diff --git a/error.h b/error.h
index 5f27f1c9149e5648b0a2ff245956a0d4db8af66e..f492eff190b4bfaf67871ba3fe9fda8fc550b400 100644 (file)
--- a/error.h
+++ b/error.h
@@ -13,7 +13,6 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 
 /* these do not need error handling (yet) */
 #define SERVER_ERRORS
-#define CLIENT_ERRORS
 #define WAV_ERRORS
 #define COMPRESS_ERRORS
 #define TIME_ERRORS
@@ -24,13 +23,27 @@ 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 CLIENT_ERRORS \
+       PARA_ERROR(TASK_STARTED, "task started"), \
+
+
+#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 +165,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,8 +211,9 @@ 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"), \
+       PARA_ERROR(AUDIOD_OFF, "audiod switched off"), \
+       PARA_ERROR(STATUS_TIMEOUT, "timeout reading server status"), \
 
 
 #define AUDIOD_COMMAND_ERRORS \
@@ -255,12 +265,9 @@ 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 \
-       PARA_ERROR(MKSTEMP, "mkstemp error: unable to create tmp file"), \
-       PARA_ERROR(FCHMOD, "fchmod error: can not set mode"), \
        PARA_ERROR(ATOI_OVERFLOW, "value too large"), \
        PARA_ERROR(STRTOLL, "unknown strtoll error"), \
        PARA_ERROR(ATOI_NO_DIGITS, "no digits found in string"), \
@@ -304,10 +311,7 @@ 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(SHORT_AFS_READ, "short read from afs socket"), \
        PARA_ERROR(NOFD, "did not receive open fd from afs"), \
 
 
@@ -321,7 +325,6 @@ extern const char **para_errlist[];
 
 
 #define HTTP_SEND_ERRORS \
-       PARA_ERROR(WRITE_OK, "can not check whether fd is writable"), \
        PARA_ERROR(MAX_CLIENTS, "maximal number of clients exceeded"), \
 
 
@@ -362,7 +365,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"), \
@@ -377,8 +379,6 @@ extern const char **para_errlist[];
        PARA_ERROR(HW_PARAMS, "unable to install hw params"), \
        PARA_ERROR(SW_PARAMS, "unable to install sw params"), \
        PARA_ERROR(BAD_PERIOD, "can not use period equal to buffer size"), \
-       PARA_ERROR(GET_XFER, "unable to obtain xfer align"), \
-       PARA_ERROR(SET_XFER, "snd_pcm_sw_params_set_xfer_align() failed"), \
        PARA_ERROR(ALSA_WRITE, "alsa write error"), \
        PARA_ERROR(PCM_OPEN, "unable to open pcm"), \
        PARA_ERROR(SND_PCM_INFO, "pcm info error"), \