X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=b6670df856ca444da821e9c63637a5bb64e15d08;hp=d648f14e33abc54c11c6228b828c9542dbcb8060;hb=61250cf03241bf73662dac3753e44660a572fa2a;hpb=8249b71509ca3a2571fed7ee2d774bd62debe6ef

diff --git a/error.h b/error.h
index d648f14e..b6670df8 100644
--- a/error.h
+++ b/error.h
@@ -64,9 +64,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"), \
@@ -97,8 +94,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 +104,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 +260,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,6 +311,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"), \
+	PARA_ERROR(SHORT_AFS_READ, "short read from afs socket"), \
+	PARA_ERROR(BAD_AFS_CODE, "received junk from afs"), \
 
 
 #define AFS_COMMON_ERRORS \
@@ -408,22 +404,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,12 +503,26 @@ 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) para_errlist[ERRNUM_TO_SS(num)] [ERRNUM_TO_INDEX(num)]
+#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 the error list for one subsystem