X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=3e4911bf6c07ca85e4e675b1d3acacec37b24163;hp=5ed3830450b2b1e19bf76600513f1c7e7ebc562d;hb=d0381117c7bce410b626bc159ab7763fdb022397;hpb=b76b4c2c3b974afa062d9fa087c18fd3483cbf8a

diff --git a/error.h b/error.h
index 5ed38304..3e4911bf 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,7 @@ 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_PARENT_DIED, "fatal: server process terminated"), \
 
 
 #define MOOD_ERRORS \
@@ -97,8 +96,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 +106,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"), \
 
 
@@ -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(BAD_AFS_CODE, "received junk 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"), \
@@ -408,22 +371,13 @@ extern const char **para_errlist[];
 
 
 #define FD_ERRORS \
-	PARA_ERROR(NOTDIR, "error: not a directory"), \
-	PARA_ERROR(F_GETFL, "failed to get fd flags"), \
-	PARA_ERROR(F_SETFL, "failed to set fd flags"), \
 	PARA_ERROR(FGETS, "fgets error"), \
-	PARA_ERROR(EXIST, "file or directory already exists"), \
-	PARA_ERROR(ISDIR, "error: is a directory"), \
-	PARA_ERROR(NOENT, "no such file or directory"), \
-	PARA_ERROR(OPEN_PERM, "open error (permission denied)"), \
-	PARA_ERROR(MKDIR_PERM, "mkdir error (permission denied)"), \
-	PARA_ERROR(MKDIR, "failed to create directory"), \
 	PARA_ERROR(CHDIR, "failed to change directory"), \
-	PARA_ERROR(FCHDIR, "fchdir failed"), \
-	PARA_ERROR(OPENDIR, "can not open directory"), \
-	PARA_ERROR(NOSPC, "no space left on device"), \
 	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 \
@@ -516,17 +470,27 @@ extern const char **para_errlist[];
  */
 #define ERRNUM_TO_INDEX(num) (((1 << SS_SHIFT) - 1) & (num))
 
+#define SYSTEM_ERROR_BIT 30
+
+#define IS_SYSTEM_ERROR(num) (!!((num) & (1 << SYSTEM_ERROR_BIT)))
+
+#define ERRNO_TO_PARA_ERROR(num) ((num) | (1 << SYSTEM_ERROR_BIT))
+
+static inline int is_errno(int val, int _errno)
+{
+	assert(val > 0 && _errno > 0);
+	return ERRNO_TO_PARA_ERROR(_errno) == val;
+}
+
 /**
  * paraslash's version of strerror(3)
  *
  * expands to the error text of \a num (a string constant).
  */
-#define PARA_STRERROR(num) (num) & (1 << 30)? \
-	strerror((num) & ((1 << 30) - 1)) : \
+#define PARA_STRERROR(num) IS_SYSTEM_ERROR(num)? \
+	strerror((num) & ((1 << SYSTEM_ERROR_BIT) - 1)) : \
 	para_errlist[ERRNUM_TO_SS(num)] [ERRNUM_TO_INDEX(num)]
 
-#define ERRNO_TO_PARA_ERROR(num) (-((num) | (1 << 30)))
-
 /**
  * define the error list for one subsystem
  #