X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=6c843e408c1bd91f722dec4ffed564cb67458537;hp=fdd2d3b7b9b6b06f8e7ba0d6a457dc249c314b3e;hb=e3272a316d113dd9c0c6f01f3087ab14f945e76b;hpb=65a0002eb560b7248cbb0b4f143d00053b66bccc

diff --git a/error.h b/error.h
index fdd2d3b7..6c843e40 100644
--- a/error.h
+++ b/error.h
@@ -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
@@ -105,6 +104,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"), \
@@ -357,6 +368,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 +381,7 @@ 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 COMMAND_ERRORS \