X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=b3eb7e6edef673e5c6c5929e26c1e9157630c560;hp=fdd2d3b7b9b6b06f8e7ba0d6a457dc249c314b3e;hb=e65bdaa6b207d5cd409acaa5d0d33fe85dd7a28d;hpb=7b3475e9effddf6de8ff282f0084c7a7bee100d6

diff --git a/error.h b/error.h
index fdd2d3b7..b3eb7e6e 100644
--- a/error.h
+++ b/error.h
@@ -6,7 +6,7 @@
 
 /** \file error.h List of error messages for all subsystems. */
 
-/** \cond */
+/** \cond errors */
 
 /* List of all subsystems that use paraslash's error facility. */
 DEFINE_ERRLIST_OBJECT_ENUM;
@@ -19,7 +19,6 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define GUI_ERRORS
 #define RINGBUFFER_ERRORS
 #define SCORE_ERRORS
-#define SHA1_ERRORS
 #define RBTREE_ERRORS
 #define RECV_ERRORS
 #define IPC_ERRORS
@@ -35,6 +34,7 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define STDOUT_ERRORS
 #define FILE_WRITE_ERRORS
 #define STDIN_ERRORS
+#define WRITE_ERRORS
 
 extern const char **para_errlist[];
 
@@ -105,6 +105,18 @@ extern const char **para_errlist[];
 	PARA_ERROR(BAD_SAMPLERATE, "sample rate not supported"), \
 
 
+#define AO_WRITE_ERRORS \
+	PARA_ERROR(AO_DEFAULT_DRIVER, "ao: no usable output device"), \
+	PARA_ERROR(AO_BAD_DRIVER, "ao: invalid driver"), \
+	PARA_ERROR(AO_BAD_OPTION, "ao option is not of type key:value"), \
+	PARA_ERROR(AO_APPEND_OPTION, "ao append option: memory allocation failure"), \
+	PARA_ERROR(AO_OPEN_LIVE, "ao: could not open audio device"), \
+	PARA_ERROR(AO_FILE_NOT_SUPP, "ao: file io drivers not supported"), \
+	PARA_ERROR(AO_PLAY, "ao_play() failed"), \
+	PARA_ERROR(AO_BAD_SAMPLE_FORMAT, "ao: unsigned sample formats not supported"), \
+	PARA_ERROR(AO_PTHREAD, "pthread error"), \
+
+
 #define COMPRESS_FILTER_ERRORS \
 	PARA_ERROR(COMPRESS_SYNTAX, "syntax error in compress filter config"), \
 	PARA_ERROR(COMPRESS_EOF, "compress: end of file"), \
@@ -306,6 +318,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(MAD_FRAME_DECODE, "mad frame decode error"), \
 	PARA_ERROR(MP3DEC_SYNTAX, "syntax error in mp3dec config"), \
 	PARA_ERROR(MP3DEC_EOF, "mp3dec: end of file"), \
+	PARA_ERROR(MP3DEC_CORRUPT, "too many corrupt frames"), \
 
 
 #define FILTER_ERRORS \
@@ -357,6 +370,12 @@ extern const char **para_errlist[];
 	PARA_ERROR(AFS_SHORT_READ, "short read from afs socket"), \
 
 
+#define CRYPT_COMMON_ERRORS \
+	PARA_ERROR(SSH_KEY_HEADER, "ssh key header not found"), \
+	PARA_ERROR(BASE64, "failed to base64-decode ssh public key"), \
+	PARA_ERROR(KEY_PERM, "unprotected private key"), \
+
+
 #define CRYPT_ERRORS \
 	PARA_ERROR(PRIVATE_KEY, "can not read private key"), \
 	PARA_ERROR(PUBLIC_KEY, "can not read public key"), \
@@ -364,7 +383,22 @@ extern const char **para_errlist[];
 	PARA_ERROR(ENCRYPT, "encrypt error"), \
 	PARA_ERROR(DECRYPT, "decrypt error"), \
 	PARA_ERROR(BLINDING, "failed to activate key blinding"), \
-	PARA_ERROR(KEY_PERM, "unprotected private key"), \
+	PARA_ERROR(BIGNUM, "bignum error"), \
+
+#define GCRYPT_ERRORS \
+	PARA_ERROR(MPI_SCAN, "could not scan multi-precision integer"), \
+	PARA_ERROR(MPI_PRINT, "could not convert multi-precision integer"), \
+	PARA_ERROR(SEXP_FIND, "could not find sublist in S-expression"), \
+	PARA_ERROR(SEXP_BUILD, "could not build S-expression"), \
+	PARA_ERROR(SEXP_ENCRYPT, "could not encrypt S-expression"), \
+	PARA_ERROR(SEXP_DECRYPT, "could not decrypt S-expression"), \
+	PARA_ERROR(MD_OPEN, "could not open message digest object"), \
+	PARA_ERROR(CIPHER_OPEN, "could not create stream cipher handle"), \
+	PARA_ERROR(BAD_PRIVATE_KEY, "invalid private key"), \
+	PARA_ERROR(KEY_MARKER, "invalid/missing key header or footer"), \
+	PARA_ERROR(ASN1_PARSE, "could not parse ASN.1 key"), \
+	PARA_ERROR(SSH_PARSE, "could not parse ssh public key"), \
+	PARA_ERROR(OEAP, "error during oeap (un)padding"), \
 
 
 #define COMMAND_ERRORS \
@@ -390,29 +424,11 @@ extern const char **para_errlist[];
 	PARA_ERROR(READ_PATTERN, "did not read expected pattern"), \
 
 
-#define WRITE_ERRORS \
-	PARA_ERROR(WRITE_SYNTAX, "para_write syntax error"), \
-
-
 #define ALSA_WRITE_ERRORS \
-	PARA_ERROR(BROKEN_CONF, "Broken alsa configuration"), \
-	PARA_ERROR(ACCESS_TYPE, "alsa access type not available"), \
-	PARA_ERROR(SAMPLE_FORMAT, "sample format not available"), \
-	PARA_ERROR(CHANNEL_COUNT, "channels count not available"), \
-	PARA_ERROR(HW_PARAMS, "unable to install hw params"), \
-	PARA_ERROR(BAD_PERIOD, "can not use period equal to buffer size"), \
-	PARA_ERROR(ALSA_WRITE, "alsa write error"), \
-	PARA_ERROR(PCM_OPEN, "unable to open pcm"), \
-	PARA_ERROR(PHYSICAL_WIDTH, "unable to determine bytes per frame"), \
-	PARA_ERROR(GET_BUFFER_TIME, "snd_pcm_hw_params_get_buffer_time_max() failed"), \
-	PARA_ERROR(SET_BUFFER_TIME, "snd_pcm_hw_params_set_buffer_time_near() failed"), \
-	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, "alsa error"), \
 
 
 #define WRITE_COMMON_ERRORS \
-	PARA_ERROR(WRITE_COMMON_SYNTAX, "syntax error in write option"), \
 	PARA_ERROR(WRITE_COMMON_EOF, "end of file"), \
 
 
@@ -425,7 +441,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(QUEUE, "packet queue overrun"), \
 
 
-/** \endcond */
+/** \endcond errors */
 
 /**
  * The subsystem shift.