Make filter config parsers return int.

[paraslash.git] / error.h

diff --git a/error.h b/error.h
index 5e3a8df0e342b0dd3b47b9a138244706f848a17d..cacc83e9c26d79d59f4a66505c9bfd278b8ff2f0 100644 (file)
--- a/error.h
+++ b/error.h
@@ -14,7 +14,6 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 /* these do not need error handling (yet) */
 #define SERVER_ERRORS
 #define WAV_ERRORS
-#define COMPRESS_ERRORS
 #define TIME_ERRORS
 #define CLOSE_ON_FORK_ERRORS
 #define DAEMON_ERRORS
@@ -25,12 +24,26 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define SHA1_ERRORS
 #define RBTREE_ERRORS
 #define RECV_ERRORS
-#define SEND_COMMON_ERRORS
 #define STDOUT_ERRORS
+#define IPC_ERRORS
+#define DCCP_SEND_ERRORS
+#define HTTP_SEND_ERRORS
 
 
 extern const char **para_errlist[];
 
+#define COMPRESS_ERRORS \
+       PARA_ERROR(COMPRESS_SYNTAX, "syntax error in compress filter config"), \
+
+
+#define AMP_FILTER_ERRORS \
+       PARA_ERROR(AMP_SYNTAX, "syntax error in amp filter config"), \
+
+
+#define SEND_COMMON_ERRORS \
+       PARA_ERROR(MAX_CLIENTS, "maximal number of clients exceeded"), \
+
+
 #define FADE_ERRORS \
        PARA_ERROR(FADE_SYNTAX, "fade syntax error"), \
 
@@ -103,7 +116,6 @@ extern const char **para_errlist[];
        PARA_ERROR(AFS_SYNTAX, "afs syntax error"), \
        PARA_ERROR(AFS_SIGNAL, "afs caught deadly signal"), \
        PARA_ERROR(AFS_SOCKET, "afs socket not writable"), \
-       PARA_ERROR(AFS_PARENT_DIED, "fatal: server process terminated"), \
        PARA_ERROR(AFS_SHORT_READ, "short read from afs socket"), \
 
 
@@ -111,6 +123,7 @@ extern const char **para_errlist[];
        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 ATTRIBUTE_ERRORS \
@@ -121,7 +134,6 @@ extern const char **para_errlist[];
 
 #define BLOB_ERRORS \
        PARA_ERROR(BLOB_SYNTAX, "blob syntax error"), \
-       PARA_ERROR(DUMMY_ROW, "attempted to access blob dummy object"), \
 
 
 #define PLAYLIST_ERRORS \
@@ -167,6 +179,7 @@ extern const char **para_errlist[];
        PARA_ERROR(CLIENT_SYNTAX, "syntax error"), \
        PARA_ERROR(INVALID_CHALLENGE, "did not receive valid challenge"), \
        PARA_ERROR(NO_CONFIG, "config file not found"), \
+       PARA_ERROR(BAD_CONFIG, "syntax error in config file"), \
        PARA_ERROR(CLIENT_AUTH, "authentication failed"), \
        PARA_ERROR(SERVER_EOF, "connection closed by para_server"), \
 
@@ -245,6 +258,7 @@ extern const char **para_errlist[];
        PARA_ERROR(OGGDEC_BADHEADER, "invalid vorbis bitstream header"), \
        PARA_ERROR(OGGDEC_FAULT, "bug or heap/stack corruption"), \
        PARA_ERROR(OGGDEC_BADLINK, "invalid stream section or requested link corrupt"), \
+       PARA_ERROR(OGGDEC_SYNTAX, "syntax error in oggdec config"), \
 
 
 #define GRAB_CLIENT_ERRORS \
@@ -314,7 +328,6 @@ extern const char **para_errlist[];
 
 
 #define VSS_ERRORS \
-       PARA_ERROR(CHUNK, "unable to get chunk"), \
        PARA_ERROR(NOFD, "did not receive open fd from afs"), \
 
 
@@ -327,10 +340,6 @@ extern const char **para_errlist[];
        PARA_ERROR(CHALLENGE, "failed to read challenge"), \
 
 
-#define HTTP_SEND_ERRORS \
-       PARA_ERROR(MAX_CLIENTS, "maximal number of clients exceeded"), \
-
-
 #define COMMAND_ERRORS \
        PARA_ERROR(COMMAND_SYNTAX, "syntax error in command"), \
        PARA_ERROR(AUTH, "did not receive auth request"), \
@@ -343,22 +352,10 @@ extern const char **para_errlist[];
        PARA_ERROR(BAD_USER, "you don't exist. Go away."), \
 
 
-#define IPC_ERRORS \
-       PARA_ERROR(SEM_GET, "failed to create semaphore"), \
-       PARA_ERROR(SEM_REMOVE, "can not remove semaphore"), \
-       PARA_ERROR(SHM_GET, "failed to allocate shared memory area"), \
-       PARA_ERROR(SHM_DESTROY, "failed to destroy shared memory area"), \
-       PARA_ERROR(SHM_ATTACH, "can not attach shared memory area"), \
-       PARA_ERROR(SHM_DETACH, "can not detach shared memory area"), \
-
-
 #define DCCP_RECV_ERRORS \
        PARA_ERROR(DCCP_OVERRUN, "dccp output buffer buffer overrun"), \
 
 
-#define DCCP_SEND_ERRORS \
-
-
 #define FD_ERRORS \
        PARA_ERROR(FGETS, "fgets error"), \
        PARA_ERROR(EMPTY, "file empty"), \