Merge branch 'master' into next

[paraslash.git] / error.h

diff --git a/error.h b/error.h
index 1cc40e7f4e6ca6ae08da109a6c416cff75bfbd1f..7416be5762c9aa09b6b858c3be1eb5f8972490f0 100644 (file)
--- a/error.h
+++ b/error.h
@@ -30,7 +30,7 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define GGO_ERRORS
 #define COLOR_ERRORS
 #define SIGNAL_ERRORS
-
+#define FADE_ERRORS
 
 extern const char **para_errlist[];
 
@@ -74,10 +74,6 @@ extern const char **para_errlist[];
        PARA_ERROR(MAX_CLIENTS, "maximal number of clients exceeded"), \
 
 
-#define FADE_ERRORS \
-       PARA_ERROR(FADE_SYNTAX, "fade syntax error"), \
-
-
 #define CLIENT_ERRORS \
        PARA_ERROR(TASK_STARTED, "task started"), \
 
@@ -111,12 +107,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 +225,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 +236,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"), \