Merge branch 'master' into next

[paraslash.git] / error.h

diff --git a/error.h b/error.h
index f2e92c61c411eb70ca7b24a7a92ec9da40b7e8bf..c9031f8201695f49fa95dd9b9047228196d581a8 100644 (file)
--- 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"), \
@@ -274,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 \