X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=a99512fdb73816d22370f60f19501a884c5df3cf;hp=59d0321f746545479f60a615e8ef8691c8105c84;hb=df6606e438a34c7bfc325e5f320843d1e97d3f7a;hpb=299df142bb50bacebc0b3050768f941bc95b5b6f

diff --git a/error.h b/error.h
index 59d0321f..a99512fd 100644
--- a/error.h
+++ b/error.h
@@ -30,13 +30,43 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define GGO_ERRORS
 #define COLOR_ERRORS
 #define SIGNAL_ERRORS
-
+#define FADE_ERRORS
+#define SERVER_COMMAND_LIST_ERRORS
+#define AFS_COMMAND_LIST_ERRORS
+#define AUDIOD_COMMAND_LIST_ERRORS
 
 extern const char **para_errlist[];
 
+#define WMA_AFH_ERRORS \
+	PARA_ERROR(NO_WMA, "asf/wma format not recognized"), \
+
+
+#define WMA_COMMON_ERRORS \
+	PARA_ERROR(WMA_NO_GUID, "audio stream guid not found"), \
+	PARA_ERROR(WMA_BAD_ASF_HEADER, "invalid asf header"), \
+
+
+#define WMADEC_FILTER_ERRORS \
+	PARA_ERROR(WMA_BAD_PARAMS, "invalid WMA parameters"), \
+	PARA_ERROR(WMA_OUTPUT_SPACE, "insufficient output space"), \
+	PARA_ERROR(WMA_BAD_SUPERFRAME, "invalid superframe"), \
+	PARA_ERROR(WMA_DECODE, "wma decode error"), \
+	PARA_ERROR(INCOHERENT_BLOCK_LEN, "incoherent block length"), \
+
+
+#define BITSTREAM_ERRORS \
+	PARA_ERROR(TABLE_ALLOC, "failed to allocate table"), \
+	PARA_ERROR(BAD_CODES, "detected incorrect codes")
+
+
+#define IMDCT_ERRORS \
+	PARA_ERROR(FFT_BAD_PARAMS, "invalid params for fft"), \
+
+
 #define PREBUFFER_FILTER_ERRORS \
 	PARA_ERROR(PREBUFFER_SYNTAX, "syntax error in prebuffer filter config"), \
 
+
 #define OSS_WRITE_ERRORS \
 	PARA_ERROR(BAD_SAMPLE_FORMAT, "sample format not supported"), \
 	PARA_ERROR(BAD_CHANNEL_COUNT, "channel count not supported"), \
@@ -74,10 +104,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 +137,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 +255,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 +266,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 +280,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 +302,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 \
@@ -304,15 +330,12 @@ extern const char **para_errlist[];
 
 
 #define OGG_AFH_ERRORS \
-	PARA_ERROR(OGG_READ, "ogg read error"), \
 	PARA_ERROR(SYNC_PAGEOUT, "ogg sync page-out error (no ogg file?)"), \
 	PARA_ERROR(STREAM_PAGEIN, "ogg stream page-in error (first page)"), \
 	PARA_ERROR(STREAM_PACKETOUT, "ogg stream packet-out error (first packet)"), \
 	PARA_ERROR(VORBIS, "vorbis synthesis header-in error (not vorbis?)"), \
-	PARA_ERROR(OGG_INFO, "ov_info error"), \
-	PARA_ERROR(OGG_VERSION, "unsupported ogg version"), \
-	PARA_ERROR(OGG_BAD_HEADER, "invalid ogg vorbis header"), \
-	PARA_ERROR(OGG_UNKNOWN_ERROR, "unknown ogg vorbis error"), \
+	PARA_ERROR(OGG_SYNC, "internal ogg storage overflow"), \
+	PARA_ERROR(OGG_EMPTY, "no ogg pages found"), \
 
 
 #define VSS_ERRORS \
@@ -327,6 +350,8 @@ extern const char **para_errlist[];
 	PARA_ERROR(ENCRYPT, "encrypt error"), \
 	PARA_ERROR(DECRYPT, "decrypt error"), \
 	PARA_ERROR(CHALLENGE, "failed to read challenge"), \
+	PARA_ERROR(BLINDING, "failed to activate key blinding"), \
+	PARA_ERROR(KEY_PERM, "unprotected private key"), \
 
 
 #define COMMAND_ERRORS \