X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=07821c221352e1124df509a7a8f6f011e04fe975;hp=d248190002fac3860157717dd6b0da55acebcfcb;hb=f77f0e0341220e10d1732404346bd2c1fe2c6835;hpb=6ce3524dbc2e688aca298836cef0d3f314f70d9b

diff --git a/error.h b/error.h
index d2481900..07821c22 100644
--- a/error.h
+++ b/error.h
@@ -25,6 +25,7 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define SCORE_ERRORS
 #define SHA1_ERRORS
 #define RECV_ERRORS
+#define AFH_COMMON_ERRORS
 
 extern const char **para_errlist[];
 
@@ -64,9 +65,6 @@ extern const char **para_errlist[];
 	PARA_ERROR(STAT, "can not stat file"), \
 	PARA_ERROR(FSTAT, "fstat error"), \
 	PARA_ERROR(RENAME, "rename failed"), \
-	PARA_ERROR(EMPTY, "file empty"), \
-	PARA_ERROR(MMAP, "mmap error"), \
-	PARA_ERROR(MUNMAP, "munmap failed"), \
 	PARA_ERROR(WRITE, "write error"), \
 	PARA_ERROR(LSEEK, "lseek error"), \
 	PARA_ERROR(BUSY, "table is busy"), \
@@ -86,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 \
@@ -97,8 +98,6 @@ extern const char **para_errlist[];
 
 #define ATTRIBUTE_ERRORS \
 	PARA_ERROR(ATTR_SYNTAX, "attribute syntax error"), \
-	PARA_ERROR(ATTR_EXISTS, "attribute already exists"), \
-	PARA_ERROR(ATTR_TABLE_FULL, "attribute table full"), \
 	PARA_ERROR(NO_ATTRIBUTES, "no attributes defined yet"), \
 
 #define BLOB_ERRORS \
@@ -109,6 +108,7 @@ extern const char **para_errlist[];
 #define PLAYLIST_ERRORS \
 	PARA_ERROR(NO_PLAYLIST, "no valid playlist found"), \
 	PARA_ERROR(PLAYLIST_LOADED, ""), /* not really an error */ \
+	PARA_ERROR(PATH_FOUND, ""), /* not really an error */ \
 	PARA_ERROR(PLAYLIST_EMPTY, "attempted to load empty playlist"), \
 
 
@@ -173,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"), \
@@ -264,8 +262,6 @@ extern const char **para_errlist[];
 #define SIGNAL_ERRORS \
 	PARA_ERROR(SIGNAL_SIG_ERR, "signal() retured SIG_ERR"), \
 	PARA_ERROR(SIGNAL_READ, "read error from signal pipe"), \
-	PARA_ERROR(WAITPID, "waitpid error"), \
-	PARA_ERROR(SIGNAL_PIPE, "failed to setup signal pipe"), \
 
 
 #define STRING_ERRORS \
@@ -317,10 +313,8 @@ extern const char **para_errlist[];
 	PARA_ERROR(BAD_AUDIO_FILE_SUFFIX, "unknown suffix"), \
 	PARA_ERROR(AUDIO_FORMAT, "audio format not recognized"), \
 	PARA_ERROR(CHUNK, "unable to get chunk"), \
-
-
-#define AFS_COMMON_ERRORS \
-	PARA_ERROR(LSTAT, "lstat error"), \
+	PARA_ERROR(SHORT_AFS_READ, "short read from afs socket"), \
+	PARA_ERROR(NOFD, "did not receive open fd from afs"), \
 
 
 #define CRYPT_ERRORS \
@@ -337,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"), \
@@ -377,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"), \
@@ -412,6 +375,9 @@ extern const char **para_errlist[];
 	PARA_ERROR(CHDIR, "failed to change directory"), \
 	PARA_ERROR(OPEN, "failed to open file"), \
 	PARA_ERROR(CHDIR_PERM, "insufficient permissions to chdir"), \
+	PARA_ERROR(EMPTY, "file empty"), \
+	PARA_ERROR(MMAP, "mmap error"), \
+	PARA_ERROR(MUNMAP, "munmap failed"), \
 
 
 #define WRITE_ERRORS \