X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=97d678176ef4b49a9892fcf67a06fc05ec902a7d;hp=0c7412681d4f9b637ab24a136d9461b83860842c;hb=refs%2Fheads%2Fmaint;hpb=17c140cc24838c2b7049e2b4c17621f4284d53dc

diff --git a/error.h b/error.h
index 0c741268..f2c6e15e 100644
--- a/error.h
+++ b/error.h
@@ -24,7 +24,6 @@
 	PARA_ERROR(AO_APPEND_OPTION, "ao append option: memory allocation failure"), \
 	PARA_ERROR(AO_BAD_DRIVER, "ao: invalid driver"), \
 	PARA_ERROR(AO_BAD_OPTION, "ao option is not of type key:value"), \
-	PARA_ERROR(AO_BAD_SAMPLE_FORMAT, "ao: unsigned sample formats not supported"), \
 	PARA_ERROR(AO_DEFAULT_DRIVER, "ao: no usable output device"), \
 	PARA_ERROR(AO_EOF, "ao: end of file"), \
 	PARA_ERROR(AO_FILE_NOT_SUPP, "ao: file io drivers not supported"), \
@@ -84,6 +83,7 @@
 	PARA_ERROR(EMPTY, "file is empty"), \
 	PARA_ERROR(ENCRYPT, "encrypt error"), \
 	PARA_ERROR(EOF, "end of file"), \
+	PARA_ERROR(EOP, "end of playlist"), \
 	PARA_ERROR(FEC_BAD_IDX, "invalid index vector"), \
 	PARA_ERROR(FECDEC_EOF, "received eof packet"), \
 	PARA_ERROR(FECDEC_OVERRUN, "fecdec output buffer overrun"), \
@@ -168,6 +168,7 @@
 	PARA_ERROR(OGG_PACKET_IN, "ogg_stream_packetin() failed"), \
 	PARA_ERROR(OGG_STREAM_FLUSH, "ogg_stream_flush() failed"), \
 	PARA_ERROR(OGG_SYNC, "internal ogg storage overflow"), \
+	PARA_ERROR(OPENSSH_PARSE, "could not parse openssh private key"), \
 	PARA_ERROR(OPUS_COMMENT, "invalid or corrupted opus comment"), \
 	PARA_ERROR(OPUS_DECODE, "opus decode error"), \
 	PARA_ERROR(OPUS_HEADER, "invalid opus header"), \
@@ -225,6 +226,7 @@
 	PARA_ERROR(TARGET_EXISTS, "requested target is already present"),\
 	PARA_ERROR(TARGET_NOT_FOUND, "requested target not found"), \
 	PARA_ERROR(TASK_STARTED, "task started"), \
+	PARA_ERROR(DEADLY_SIGNAL, "termination request by signal"), \
 	PARA_ERROR(TOO_MANY_CLIENTS, "maximal number of stat clients exceeded"), \
 	PARA_ERROR(UCRED_PERM, "permission denied"), \
 	PARA_ERROR(UDP_OVERRUN, "output buffer overrun"), \
@@ -254,8 +256,9 @@
 enum para_error_codes {PARA_ERRORS};
 #undef PARA_ERROR
 #define PARA_ERROR(err, msg) msg
-/** Array of error strings. */
+/** All .c files need the declararation of the array of error strings. */
 extern const char * const para_errlist[];
+/** Exactly one .c file per executable must define the array. */
 #define DEFINE_PARA_ERRLIST const char * const para_errlist[] = {PARA_ERRORS}
 
 /**
@@ -265,11 +268,10 @@ extern const char * const para_errlist[];
  */
 #define SYSTEM_ERROR_BIT 30
 
-/**
- * Like the SYSTEM_ERROR_BIT, but indicates an error from the osl library.
- */
+/** Like SYSTEM_ERROR_BIT, but for errors from the osl library. */
 #define OSL_ERROR_BIT 29
 
+/** Like SYSTEM_ERROR_BIT, but for errors from the lopsub library. */
 #define LLS_ERROR_BIT 28
 
 /** Check whether the system error bit is set. */
@@ -301,18 +303,20 @@ static const char *weak_lls_strerror(int) __attribute__ ((weakref("lls_strerror"
  */
 _static_inline_ const char *para_strerror(int num)
 {
+	unsigned idx = num & ~((1U << OSL_ERROR_BIT) | (1U << LLS_ERROR_BIT)
+		| (1U << SYSTEM_ERROR_BIT));
 	assert(num > 0);
 	if (IS_OSL_ERROR(num)) {
 		assert(weak_osl_strerror);
-		return weak_osl_strerror(num & ~(1U << OSL_ERROR_BIT));
+		return weak_osl_strerror(idx);
 	}
 	if (IS_LLS_ERROR(num)) {
 		assert(weak_lls_strerror);
-		return weak_lls_strerror(num & ~(1U << LLS_ERROR_BIT));
+		return weak_lls_strerror(idx);
 	}
 	if (IS_SYSTEM_ERROR(num))
-		return strerror(num & ~(1U << SYSTEM_ERROR_BIT));
-	return para_errlist[num];
+		return strerror(idx);
+	return para_errlist[idx];
 }
 
 /**