X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=error.h;h=79ead6dbae446325dc19648d9426906cc6e0569c;hb=eb992f2fc3ff5b6bd1c0b91d473b07675fe5b927;hp=2e32c24044bd074cc9e311903adde6d85ac5a4c0;hpb=32e646780461f96682d1191d31e08e4602ab125e;p=paraslash.git

diff --git a/error.h b/error.h
index 2e32c240..79ead6db 100644
--- a/error.h
+++ b/error.h
@@ -34,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[];
 
@@ -104,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"), \
@@ -356,6 +369,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"), \
@@ -363,7 +382,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 \
@@ -389,10 +423,6 @@ 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"), \
@@ -411,7 +441,6 @@ extern const char **para_errlist[];
 
 
 #define WRITE_COMMON_ERRORS \
-	PARA_ERROR(WRITE_COMMON_SYNTAX, "syntax error in write option"), \
 	PARA_ERROR(WRITE_COMMON_EOF, "end of file"), \