X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=d6a425508a207c15746e767a525ed359651d8f62;hp=fb46ec548714c6e30ddcc01f2cd891ad1fd9f419;hb=810761a3cdf3f75dd8e07a5d903793048c36df1d;hpb=6494f4bfddde1b9e06c4cb8bcd3acf7b9cc762f1

diff --git a/error.h b/error.h
index fb46ec54..d6a42550 100644
--- a/error.h
+++ b/error.h
@@ -23,32 +23,75 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define SHA1_ERRORS
 #define RBTREE_ERRORS
 #define RECV_ERRORS
-#define STDOUT_ERRORS
 #define IPC_ERRORS
 #define DCCP_SEND_ERRORS
 #define HTTP_SEND_ERRORS
 #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 BUFFER_TREE_ERRORS \
+	PARA_ERROR(BTR_EOF, "buffer tree: end of file"), \
+	PARA_ERROR(BTR_NO_CHILD, "btr node has no children"), \
+
+#define STDOUT_ERRORS \
+	PARA_ERROR(STDOUT_EOF, "stdout: end of file"), \
+
+
+#define BITSTREAM_ERRORS \
+	PARA_ERROR(VLC, "invalid vlc code"), \
+
+
+#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_BLOCK_SIZE, "invalid block size"), \
+	PARA_ERROR(INCOHERENT_BLOCK_LEN, "incoherent block length"), \
+	PARA_ERROR(WMADEC_EOF, "wmadec: end of file"), \
+
+
+#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"), \
+	PARA_ERROR(PREBUFFER_SUCCESS, "prebuffering complete"), \
+
 
 #define OSS_WRITE_ERRORS \
 	PARA_ERROR(BAD_SAMPLE_FORMAT, "sample format not supported"), \
 	PARA_ERROR(BAD_CHANNEL_COUNT, "channel count not supported"), \
 	PARA_ERROR(BAD_SAMPLERATE, "sample rate not supported"), \
+	PARA_ERROR(OSS_EOF, "oss: end of file"), \
 
 
 #define COMPRESS_FILTER_ERRORS \
 	PARA_ERROR(COMPRESS_SYNTAX, "syntax error in compress filter config"), \
+	PARA_ERROR(COMPRESS_EOF, "compress: end of file"), \
 
 
 #define WAV_FILTER_ERRORS \
 	PARA_ERROR(WAV_BAD_FC, "invalid filter chain configuration"), \
+	PARA_ERROR(WAV_EOF, "wav filter: end of file"), \
+	PARA_ERROR(WAV_SUCCESS, "successfully wrote wav header"), \
 
 
 #define FEC_ERRORS \
@@ -68,16 +111,14 @@ extern const char **para_errlist[];
 
 #define AMP_FILTER_ERRORS \
 	PARA_ERROR(AMP_SYNTAX, "syntax error in amp filter config"), \
+	PARA_ERROR(AMP_ZERO_AMP, "no amplification necessary"), \
+	PARA_ERROR(AMP_EOF, "amp: end of file"), \
 
 
 #define SEND_COMMON_ERRORS \
 	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 +152,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"), \
@@ -184,6 +227,7 @@ extern const char **para_errlist[];
 
 #define STDIN_ERRORS \
 	PARA_ERROR(STDIN_EOF, "end of file"), \
+	PARA_ERROR(STDIN_OVERRUN, "stdin: output buffer overrun"), \
 
 
 
@@ -227,6 +271,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 +282,7 @@ 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"), \
 
 
 #define OGGDEC_FILTER_ERRORS \
@@ -248,22 +293,21 @@ extern const char **para_errlist[];
 	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"), \
+	PARA_ERROR(OGGDEC_EOF, "oggdec: end of file"), \
 
 
 #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 \
 	PARA_ERROR(MAD_FRAME_DECODE, "mad frame decode error"), \
 	PARA_ERROR(MP3DEC_OVERRUN, "mp3 output buffer overrun"), \
 	PARA_ERROR(MP3DEC_SYNTAX, "syntax error in mp3dec config"), \
+	PARA_ERROR(MP3DEC_EOF, "mp3dec: end of file"), \
 
 
 #define FILTER_ERRORS \
@@ -276,6 +320,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(REGEX, "regular expression error") \
 
 
 #define EXEC_ERRORS \
@@ -302,15 +348,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 \
@@ -325,18 +368,21 @@ 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 \
 	PARA_ERROR(COMMAND_SYNTAX, "syntax error in command"), \
-	PARA_ERROR(AUTH, "did not receive auth request"), \
+	PARA_ERROR(AUTH_REQUEST, "did not receive auth request"), \
 	PARA_ERROR(NO_AUDIO_FILE, "no audio file"), \
 	PARA_ERROR(BAD_CMD, "invalid command"), \
 	PARA_ERROR(PERM, "permission denied"), \
 	PARA_ERROR(LOCK, "lock error"), \
 	PARA_ERROR(SENDER_CMD, "command not supported by this sender"), \
 	PARA_ERROR(SERVER_CRASH, "para_server crashed -- can not live without it"), \
-	PARA_ERROR(BAD_USER, "you don't exist. Go away."), \
+	PARA_ERROR(BAD_USER, "auth request for invalid user"), \
+	PARA_ERROR(BAD_AUTH, "authentication failure"), \
 
 
 #define DCCP_RECV_ERRORS \
@@ -353,6 +399,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(WAV_HEADER_SUCCESS, "successfully read wave header"), \
 	PARA_ERROR(NO_DELAY, "no initial delay"), \
 	PARA_ERROR(DELAY_TIMEOUT, "initial delay timeout"), \
+	PARA_ERROR(WRITE_EOF, "end of file"), \
 
 
 #define ALSA_WRITE_ERRORS \
@@ -370,6 +417,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(SET_RATE, "snd_pcm_hw_params_set_rate_near failed"), \
 	PARA_ERROR(START_THRESHOLD, "snd_pcm_sw_params_set_start_threshold() failed"), \
 	PARA_ERROR(STOP_THRESHOLD, "snd_pcm_sw_params_set_stop_threshold() failed"), \
+	PARA_ERROR(ALSA_EOF, "alsa: end of file"), \
 
 
 #define FILE_WRITE_ERRORS \
@@ -380,12 +428,14 @@ extern const char **para_errlist[];
 
 #define WRITE_COMMON_ERRORS \
 	PARA_ERROR(WRITE_COMMON_SYNTAX, "syntax error in write option"), \
+	PARA_ERROR(WRITE_COMMON_EOF, "write: end of file"), \
 
 
 #define AACDEC_FILTER_ERRORS \
 	PARA_ERROR(AACDEC_INIT, "failed to init aac decoder"), \
 	PARA_ERROR(AAC_DECODE, "aac decode error"), \
 	PARA_ERROR(AAC_OVERRUN, "aac output buffer overrun"), \
+	PARA_ERROR(AACDEC_EOF, "aacdec: end of file"), \
 
 
 #define CHUNK_QUEUE_ERRORS \
@@ -505,7 +555,7 @@ _static_inline_ int osl(int ret)
 {
 	if (ret >= 0)
 		return ret;
-	return OSL_ERRNO_TO_PARA_ERROR(-ret);
+	return -OSL_ERRNO_TO_PARA_ERROR(-ret);
 }
 
 /**