X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=fe44ff5c50487744881ea1d21d1007528a2ecd70;hp=0e815444b821b6e5d7796a478a5fc209fd623c01;hb=refs%2Fheads%2Fpu;hpb=c117f6c60700c5d064305d596e481bb45aa4b459

diff --git a/error.h b/error.h
index 0e815444..971d3e7f 100644
--- a/error.h
+++ b/error.h
@@ -19,13 +19,11 @@
 	PARA_ERROR(ALSA_MIX_OPEN, "could not open mixer"), \
 	PARA_ERROR(ALSA_MIX_RANGE, "value control element out of range"), \
 	PARA_ERROR(ALSA_MIX_SET_VAL, "could not set control element state"), \
-	PARA_ERROR(AMP_EOF, "amp: end of file"), \
 	PARA_ERROR(AMP_ZERO_AMP, "no amplification necessary"), \
 	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_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"), \
 	PARA_ERROR(AO_OPEN_LIVE, "ao: could not open audio device"), \
 	PARA_ERROR(AO_PLAY, "ao_play() failed"), \
@@ -36,7 +34,6 @@
 	PARA_ERROR(ATOI_OVERFLOW, "value too large"), \
 	PARA_ERROR(ATTR_SYNTAX, "attribute syntax error"), \
 	PARA_ERROR(ATT_TABLE_FULL, "no more space left in attribute table"), \
-	PARA_ERROR(AUDIOC_EOF, "audioc: end of file"), \
 	PARA_ERROR(AUDIOD_OFF, "audiod switched off"), \
 	PARA_ERROR(AUDIOD_SIGNAL, "caught deadly signal"), \
 	PARA_ERROR(AUDIOD_TERM, "terminating on user request"), \
@@ -65,7 +62,6 @@
 	PARA_ERROR(BIGNUM, "bignum error"), \
 	PARA_ERROR(BLINDING, "failed to activate key blinding"), \
 	PARA_ERROR(BLOB_SYNTAX, "blob syntax error"), \
-	PARA_ERROR(BTR_EOF, "buffer tree: end of file"), \
 	PARA_ERROR(BTR_NAVAIL, "btr node: value currently unavailable"), \
 	PARA_ERROR(BTR_NO_CHILD, "btr node has no children"), \
 	PARA_ERROR(CHILD_CONTEXT, "now running in child context"), \
@@ -73,7 +69,6 @@
 	PARA_ERROR(CLIENT_SYNTAX, "syntax error"), \
 	PARA_ERROR(CLIENT_WRITE, "client write error"), \
 	PARA_ERROR(COMMAND_SYNTAX, "syntax error in command"), \
-	PARA_ERROR(COMPRESS_EOF, "compress: end of file"), \
 	PARA_ERROR(CREATE_OPUS_DECODER, "could not create opus decoder"), \
 	PARA_ERROR(DCCP_OVERRUN, "dccp output buffer buffer overrun"), \
 	PARA_ERROR(DECRYPT, "decrypt error"), \
@@ -84,7 +79,6 @@
 	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"), \
 	PARA_ERROR(FEC_PARMS, "invalid fec parameters"), \
 	PARA_ERROR(FEC_PIVOT, "pivot column not found"), \
@@ -97,7 +91,6 @@
 	PARA_ERROR(FLAC_CHAIN_READ, "could not read meta chain"), \
 	PARA_ERROR(FLACDEC_DECODER_ALLOC, "could not allocate stream decoder"), \
 	PARA_ERROR(FLACDEC_DECODER_INIT, "could not init stream decoder"), \
-	PARA_ERROR(FLACDEC_EOF, "flacdec encountered end of file condition"), \
 	PARA_ERROR(FLAC_DECODE_POS, "could not get decode position"), \
 	PARA_ERROR(FLAC_ITER_ALLOC, "could not allocate meta iterator"), \
 	PARA_ERROR(FLAC_REPLACE_COMMENT, "could not replace vorbis comment"), \
@@ -115,7 +108,6 @@
 	PARA_ERROR(HEADER_BITRATE, "invalid header bitrate"), \
 	PARA_ERROR(HEADER_FREQ, "invalid header frequency"), \
 	PARA_ERROR(HTTP_RECV_OVERRUN, "http_recv: output buffer overrun"), \
-	PARA_ERROR(I9E_EOF, "end of input"), \
 	PARA_ERROR(I9E_SETUPTERM, "failed to set up terminal"), \
 	PARA_ERROR(I9E_TERM_RQ, "received termination request"), \
 	PARA_ERROR(ID3_ATTACH, "could not attach id3 frame"), \
@@ -134,7 +126,6 @@
 	PARA_ERROR(MISSING_COLON, "syntax error: missing colon"), \
 	PARA_ERROR(MOOD_PARSE, "mood parse error"), \
 	PARA_ERROR(MP3DEC_CORRUPT, "too many corrupt frames"), \
-	PARA_ERROR(MP3DEC_EOF, "mp3dec: end of file"), \
 	PARA_ERROR(MP3_INFO, "could not read mp3 info"), \
 	PARA_ERROR(MP4_READ, "mp4: read error or unexpected end of file"), \
 	PARA_ERROR(MP4_CORRUPT, "invalid/corrupt mp4 file"), \
@@ -164,6 +155,7 @@
 	PARA_ERROR(OGG_PACKET_IN, "ogg_stream_packetin() failed"), \
 	PARA_ERROR(OGG_SYNC, "internal ogg storage overflow"), \
 	PARA_ERROR(OPENSSH_PARSE, "could not parse openssh private key"), \
+	PARA_ERROR(OPENSSL, "openssl error"), \
 	PARA_ERROR(OPUS_COMMENT, "invalid or corrupted opus comment"), \
 	PARA_ERROR(OPUS_DECODE, "opus decode error"), \
 	PARA_ERROR(OPUS_HEADER, "invalid opus header"), \
@@ -171,13 +163,10 @@
 	PARA_ERROR(PATH_FOUND, ""), /* not really an error */ \
 	PARA_ERROR(PLAYLIST_EMPTY, "attempted to load empty playlist"), \
 	PARA_ERROR(PREBUFFER_SUCCESS, "prebuffering complete"), \
-	PARA_ERROR(PRIVATE_KEY, "can not read private key"), \
 	PARA_ERROR(QUEUE, "packet queue overrun"), \
 	PARA_ERROR(READ_PATTERN, "did not read expected pattern"), \
-	PARA_ERROR(RECV_EOF, "end of file"), \
 	PARA_ERROR(RECVMSG, "recvmsg() failed"), \
 	PARA_ERROR(REGEX, "regular expression error"), \
-	PARA_ERROR(RESAMPLE_EOF, "resample filter: end of file"), \
 	PARA_ERROR(RSA, "RSA error"), \
 	PARA_ERROR(RSA_DECODE, "RSA decoding error"), \
 	PARA_ERROR(SB_PACKET_SIZE, "invalid sideband packet size or protocol error"), \
@@ -187,7 +176,6 @@
 	PARA_ERROR(SERVER_CMD_FAILURE, "command failed"), \
 	PARA_ERROR(SERVER_CMD_SUCCESS, "command terminated successfully"), \
 	PARA_ERROR(SERVER_CRASH, "para_server crashed -- can not live without it"), \
-	PARA_ERROR(SERVER_EOF, "connection closed by para_server"), \
 	PARA_ERROR(SEXP_BUILD, "could not build S-expression"), \
 	PARA_ERROR(SEXP_DECRYPT, "could not decrypt S-expression"), \
 	PARA_ERROR(SEXP_ENCRYPT, "could not encrypt S-expression"), \
@@ -231,15 +219,12 @@
 	PARA_ERROR(VORBIS_COMMENTHEADER, "could not create vorbis comment header"), \
 	PARA_ERROR(VORBIS, "vorbis synthesis header-in error (not vorbis?)"), \
 	PARA_ERROR(WAV_BAD_FC, "invalid filter configuration"), \
-	PARA_ERROR(WAV_EOF, "wav filter: end of file"), \
 	PARA_ERROR(WAV_SUCCESS, "successfully wrote wav header"), \
 	PARA_ERROR(WMA_BAD_PARAMS, "invalid WMA parameters"), \
 	PARA_ERROR(WMA_BAD_SUPERFRAME, "invalid superframe"), \
 	PARA_ERROR(WMA_BLOCK_SIZE, "invalid block size"), \
-	PARA_ERROR(WMADEC_EOF, "wmadec: end of file"), \
 	PARA_ERROR(WMA_NO_GUID, "audio stream guid not found"), \
 	PARA_ERROR(WMA_OUTPUT_SPACE, "insufficient output space"), \
-	PARA_ERROR(WRITE_COMMON_EOF, "end of file"), \
 
 /**
  * This is temporarily defined to expand to its first argument (prefixed by
@@ -305,18 +290,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];
 }
 
 /**