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

diff --git a/error.h b/error.h
index 14e5b072..f2c6e15e 100644
--- a/error.h
+++ b/error.h
@@ -83,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"), \
@@ -167,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"), \
@@ -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];
 }
 
 /**