X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=40cccd5691ab537eb3cdd227e76971be68c4ef6a;hp=c164700d7116db83680788a6a493fd350a180835;hb=6751fdf54c240791298420b3034a32aa9cdc4200;hpb=a05a33be9ed15982aabfa13726317a1fcb13cc19

diff --git a/error.h b/error.h
index c164700d..40cccd56 100644
--- a/error.h
+++ b/error.h
@@ -84,17 +84,14 @@ extern const char **para_errlist[];
 #define AFS_ERRORS \
 	PARA_ERROR(BAD_TABLE_NAME, "invalid table"), \
 	PARA_ERROR(INPUT_TOO_LARGE, "input too large for stdin command"), \
-	PARA_ERROR(READ, "read error"), \
 	PARA_ERROR(AFS_SYNTAX, "afs syntax error"), \
 	PARA_ERROR(AFS_SIGNAL, "afs caught deadly signal"), \
 
 
 #define MOOD_ERRORS \
 	PARA_ERROR(MOOD_SYNTAX, "mood syntax error"), \
-	PARA_ERROR(MOOD_REGEX, "invalid regular expression"), \
 	PARA_ERROR(NO_MOOD, "no mood available"), \
 	PARA_ERROR(MOOD_LOADED, "mood loaded"), \
-	PARA_ERROR(MOOD_BUSY, "mood is in use"), \
 	PARA_ERROR(NOT_ADMISSIBLE, "file is not admussible"), \
 
 
@@ -110,7 +107,6 @@ extern const char **para_errlist[];
 
 
 #define PLAYLIST_ERRORS \
-	PARA_ERROR(PLAYLIST_SYNTAX, "playlist syntax error"), \
 	PARA_ERROR(NO_PLAYLIST, "no valid playlist found"), \
 	PARA_ERROR(PLAYLIST_LOADED, ""), /* not really an error */ \
 	PARA_ERROR(PLAYLIST_EMPTY, "attempted to load empty playlist"), \
@@ -146,8 +142,6 @@ extern const char **para_errlist[];
 	PARA_ERROR(AUDIOC_SYNTAX, "audioc syntax error"), \
 	PARA_ERROR(AUDIOC_READ, "audioc read error"), \
 	PARA_ERROR(AUDIOC_WRITE, "audioc write error"), \
-	PARA_ERROR(INIT_SOCK_ADDR, "can not init socket"), \
-	PARA_ERROR(AUDIOC_CONNECT, "audioc connect error"), \
 	PARA_ERROR(AUDIOC_OVERRUN, "audioc buffer overrun"), \
 
 
@@ -270,8 +264,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 \
@@ -326,7 +318,6 @@ extern const char **para_errlist[];
 
 
 #define AFS_COMMON_ERRORS \
-	PARA_ERROR(GETCWD, "can not get current working directory"), \
 	PARA_ERROR(LSTAT, "lstat error"), \
 
 
@@ -415,20 +406,8 @@ 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"), \
 
@@ -523,12 +502,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