X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=a2f719f51aa92d419851040c6bdaf7b7874d996b;hp=27e9e264ba10206e9218ac25013f63f04bc821ec;hb=7bf76e7907de7836f75c299dc2e828364e4f114e;hpb=4f18e922663731106fbc64dcc0583a7b017ac407

diff --git a/error.h b/error.h
index 27e9e264..a2f719f5 100644
--- a/error.h
+++ b/error.h
@@ -103,7 +103,7 @@ extern const char **para_errlist[];
 
 
 #define AFH_RECV_ERRORS \
-	PARA_ERROR(AFH_RECV_BAD_FILENAME, "invalid file name"), \
+	PARA_ERROR(AFH_RECV_BAD_FILENAME, "no file name given"), \
 
 
 #define OGG_AFH_COMMON_ERRORS \
@@ -148,6 +148,7 @@ extern const char **para_errlist[];
 
 
 #define WMA_COMMON_ERRORS \
+	PARA_ERROR(BAD_ASF_FILE_PROPS, "invalid ASF file properties"), \
 	PARA_ERROR(WMA_NO_GUID, "audio stream guid not found"), \
 
 
@@ -246,7 +247,6 @@ extern const char **para_errlist[];
 
 #define MOOD_ERRORS \
 	PARA_ERROR(NO_MOOD, "no mood available"), \
-	PARA_ERROR(DUMMY_ROW, "attempted to access blob dummy object"), \
 
 
 #define MM_ERRORS \
@@ -261,6 +261,7 @@ extern const char **para_errlist[];
 
 #define BLOB_ERRORS \
 	PARA_ERROR(BLOB_SYNTAX, "blob syntax error"), \
+	PARA_ERROR(DUMMY_ROW, "attempted to access blob dummy object"), \
 
 
 #define PLAYLIST_ERRORS \
@@ -279,6 +280,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(NO_AFHI, "audio format handler info required"), \
 	PARA_ERROR(AFT_SYNTAX, "audio file table syntax error"), \
 	PARA_ERROR(HASH_MISMATCH, "hash mismatch, consider re-add"), \
+	PARA_ERROR(NO_MATCH, "no matches"), \
 
 
 #define USER_LIST_ERRORS \
@@ -305,7 +307,6 @@ extern const char **para_errlist[];
 	PARA_ERROR(SERVER_EOF, "connection closed by para_server"), \
 	PARA_ERROR(SERVER_CMD_SUCCESS, "command terminated successfully"), \
 	PARA_ERROR(SERVER_CMD_FAILURE, "command failed"), \
-	PARA_ERROR(INCOMPAT_FEAT, "client/server incompatibility"), \
 
 
 #define NET_ERRORS \
@@ -395,6 +396,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(SIZE_PREFIX, "bad size prefix"), \
 	PARA_ERROR(REGEX, "regular expression error"), \
 	PARA_ERROR(ARG_NOT_FOUND, "argument not found in arg vector"), \
+	PARA_ERROR(BAD_LL, "invalid loglevel"), \
 
 
 #define EXEC_ERRORS \
@@ -408,7 +410,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(HEADER_FREQ, "invalid header frequency"), \
 	PARA_ERROR(HEADER_BITRATE, "invalid header bitrate"), \
 	PARA_ERROR(ID3_DETACH, "could not detach id3 frame"), \
-	PARA_ERROR(ID3_ATTACH, "could not atttach id3 frame"), \
+	PARA_ERROR(ID3_ATTACH, "could not attach id3 frame"), \
 	PARA_ERROR(ID3_SETENCODING, "could not set id3 text encoding field"), \
 	PARA_ERROR(ID3_SETSTRING, "could not set id3 string field"), \
 
@@ -417,7 +419,6 @@ extern const char **para_errlist[];
 	PARA_ERROR(MP4ASC, "audio spec config error"), \
 	PARA_ERROR(AAC_AFH_INIT, "failed to init aac decoder"), \
 	PARA_ERROR(MP4V2, "mp4v2 library error"), \
-	PARA_ERROR(NO_AUDIO_TRACK, "file contains no valid audio track"), \
 
 #define AAC_COMMON_ERRORS \
 	PARA_ERROR(ESDS, "did not find esds atom"), \
@@ -439,9 +440,10 @@ extern const char **para_errlist[];
 
 #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 BASE64_ERRORS \
+	PARA_ERROR(BASE64, "base64 decode error"), \
 
 #define CRYPT_ERRORS \
 	PARA_ERROR(PRIVATE_KEY, "can not read private key"), \
@@ -578,6 +580,8 @@ extern const char **para_errlist[];
 /** Set the osl error bit for the given number. */
 #define OSL_ERRNO_TO_PARA_ERROR(num) ((num) | (1 << OSL_ERROR_BIT))
 
+
+static const char *weak_osl_strerror(int) __attribute__ ((weakref("osl_strerror")));
 /**
  * Paraslash's version of strerror(3).
  *
@@ -588,12 +592,12 @@ extern const char **para_errlist[];
 _static_inline_ const char *para_strerror(int num)
 {
 	assert(num > 0);
-#ifdef _OSL_H
-	if (IS_OSL_ERROR(num))
-		return osl_strerror(num & ((1 << OSL_ERROR_BIT) - 1));
-#endif
+	if (IS_OSL_ERROR(num)) {
+		assert(weak_osl_strerror);
+		return weak_osl_strerror(num & ~(1U << OSL_ERROR_BIT));
+	}
 	if (IS_SYSTEM_ERROR(num))
-		return strerror(num & ((1 << SYSTEM_ERROR_BIT) - 1));
+		return strerror(num & ~(1U << SYSTEM_ERROR_BIT));
 	return para_errlist[ERRNUM_TO_SS(num)][ERRNUM_TO_INDEX(num)];
 }