Get rid of E_SEND.

[paraslash.git] / error.h

diff --git a/error.h b/error.h
index 9d1f7bb08c8f8f9815ae7744a65c2db89853e9ce..07821c221352e1124df509a7a8f6f011e04fe975 100644 (file)
--- a/error.h
+++ b/error.h
@@ -84,6 +84,9 @@ extern const char **para_errlist[];
        PARA_ERROR(INPUT_TOO_LARGE, "input too large for stdin command"), \
        PARA_ERROR(AFS_SYNTAX, "afs syntax error"), \
        PARA_ERROR(AFS_SIGNAL, "afs caught deadly signal"), \
+       PARA_ERROR(AFS_SOCKET, "afs socket not writable"), \
+       PARA_ERROR(AFS_PARENT_DIED, "fatal: server process terminated"), \
+       PARA_ERROR(AFS_SHORT_READ, "short read from afs socket"), \
 
 
 #define MOOD_ERRORS \
@@ -170,8 +173,6 @@ extern const char **para_errlist[];
 
 
 #define NET_ERRORS \
-       PARA_ERROR(SEND, "send error"), \
-       PARA_ERROR(RECV, "receive error"), \
        PARA_ERROR(SOCKET, "socket error"), \
        PARA_ERROR(CONNECT, "connect error"), \
        PARA_ERROR(ACCEPT, "accept error"), \
@@ -313,11 +314,7 @@ extern const char **para_errlist[];
        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(BAD_AFS_CODE, "received junk from afs"), \
-
-
-#define AFS_COMMON_ERRORS \
-       PARA_ERROR(LSTAT, "lstat error"), \
+       PARA_ERROR(NOFD, "did not receive open fd from afs"), \
 
 
 #define CRYPT_ERRORS \
@@ -334,33 +331,6 @@ extern const char **para_errlist[];
        PARA_ERROR(SEND_QUEUED_CHUNK, "failed to send queued chunk"), \
 
 
-#define RANDOM_SELECTOR_ERRORS \
-       PARA_ERROR(NOTHING_FOUND, "no audio files found"), \
-
-
-#define MYSQL_SELECTOR_ERRORS \
-       PARA_ERROR(MYSQL_SYNTAX, "mysql syntax error"), \
-       PARA_ERROR(NOTCONN, "not connected to mysql server"), \
-       PARA_ERROR(TOOBIG, "mysql: file too large"), \
-       PARA_ERROR(NAMETOOLONG, "mysql: name too long"), \
-       PARA_ERROR(QFAILED, "mysql query failed"), \
-       PARA_ERROR(NOROW, "row is NULL"), \
-       PARA_ERROR(NOATTS, "can not get attributes from mysql table"), \
-       PARA_ERROR(NORESULT, "error while fetching mysql result"), \
-       PARA_ERROR(EMPTY_RESULT, "result is empty"), \
-       PARA_ERROR(ESCAPE, "can not escape string"), \
-       PARA_ERROR(GET_AUDIO_FILE, "can not get current audio file"), \
-       PARA_ERROR(GET_STREAM, "can not get current stream"), \
-       PARA_ERROR(NO_STREAM, "no such stream"), \
-       PARA_ERROR(AUDIO_FILE, "no such audio file"), \
-       PARA_ERROR(GET_QUERY, "can not get query for specified stream"), \
-       PARA_ERROR(TMPFILE, "error while writing temporary file"), \
-       PARA_ERROR(META, "can not get meta data"), \
-       PARA_ERROR(MYSQL_INIT, "can not initialize mysql connection"), \
-       PARA_ERROR(NO_MYSQL_PASSWD, "fatal: no mysql passord given"), \
-       PARA_ERROR(NO_AF_DIR, "fatal: audio file directory not given"), \
-
-
 #define COMMAND_ERRORS \
        PARA_ERROR(COMMAND_SYNTAX, "syntax error in command"), \
        PARA_ERROR(AUTH, "did not receive auth request"), \
@@ -374,10 +344,6 @@ extern const char **para_errlist[];
        PARA_ERROR(BAD_USER, "you don't exist. Go away."), \
 
 
-#define PLAYLIST_SELECTOR_ERRORS \
-       PARA_ERROR(LOAD_PLAYLIST, "failed to load playlist"), \
-
-
 #define IPC_ERRORS \
        PARA_ERROR(SEM_GET, "failed to create semaphore"), \
        PARA_ERROR(SEM_REMOVE, "can not remove semaphore"), \