X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=d9133aa1317647c4bbf70f8052a8dff213f7f665;hp=59d0321f746545479f60a615e8ef8691c8105c84;hb=899677b50128e00e58d76d26c05be9f078204c67;hpb=f31f8ceeaff0db558b63a46559e7d7464859d0c4

diff --git a/error.h b/error.h
index 59d0321f..d9133aa1 100644
--- a/error.h
+++ b/error.h
@@ -111,12 +111,14 @@ extern const char **para_errlist[];
 
 
 #define MOOD_ERRORS \
-	PARA_ERROR(MOOD_SYNTAX, "mood syntax error"), \
 	PARA_ERROR(NO_MOOD, "no mood available"), \
-	PARA_ERROR(NOT_ADMISSIBLE, "file is not admissible"), \
 	PARA_ERROR(DUMMY_ROW, "attempted to access blob dummy object"), \
 
 
+#define MM_ERRORS \
+	PARA_ERROR(MOOD_SYNTAX, "mood syntax error"), \
+
+
 #define ATTRIBUTE_ERRORS \
 	PARA_ERROR(ATTR_SYNTAX, "attribute syntax error"), \
 	PARA_ERROR(NO_ATTRIBUTES, "no attributes defined yet"), \
@@ -227,6 +229,8 @@ extern const char **para_errlist[];
 	PARA_ERROR(AUDIOD_SYNTAX, "syntax error"), \
 	PARA_ERROR(UCRED_PERM, "permission denied"), \
 	PARA_ERROR(INVALID_AUDIOD_CMD, "invalid command"), \
+	PARA_ERROR(TOO_MANY_CLIENTS, "maximal number of stat clients exceeded"), \
+	PARA_ERROR(UNKNOWN_STAT_ITEM, "status item not recognized"), \
 
 
 #define FILTER_COMMON_ERRORS \
@@ -236,8 +240,6 @@ extern const char **para_errlist[];
 
 
 #define STAT_ERRORS \
-	PARA_ERROR(TOO_MANY_CLIENTS, "maximal number of stat clients exceeded"), \
-	PARA_ERROR(UNKNOWN_STAT_ITEM, "status item not recognized"), \
 	PARA_ERROR(STAT_ITEM_PARSE, "failed to parse status item"), \
 
 
@@ -252,13 +254,10 @@ extern const char **para_errlist[];
 
 
 #define GRAB_CLIENT_ERRORS \
-	PARA_ERROR(PEDANTIC_GRAB, "fd not ready and pedantic grab requested"), \
 	PARA_ERROR(GC_WRITE, "grab client write error"), \
 	PARA_ERROR(BAD_GC_SLOT, "invalid slot requested by grab client"), \
 	PARA_ERROR(BAD_GC_FILTER_NUM, "invalid filter number given"), \
 	PARA_ERROR(GC_SYNTAX, "grab client syntax error"), \
-	PARA_ERROR(GC_HELP_GIVEN, ""), /* not really an error */ \
-	PARA_ERROR(GC_VERSION_GIVEN, ""), /* not really an error */ \
 
 
 #define MP3DEC_FILTER_ERRORS \
@@ -277,7 +276,8 @@ extern const char **para_errlist[];
 	PARA_ERROR(STRTOLL, "unknown strtoll error"), \
 	PARA_ERROR(ATOI_NO_DIGITS, "no digits found in string"), \
 	PARA_ERROR(ATOI_JUNK_AT_END, "further characters after number"), \
-	PARA_ERROR(SIZE_PREFIX, "bad size prefix") \
+	PARA_ERROR(SIZE_PREFIX, "bad size prefix"), \
+	PARA_ERROR(REGEX, "regular expression error") \
 
 
 #define EXEC_ERRORS \