X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=ff85c8d18455e356f6e220c642b776570db86111;hp=b735233339f1b64a89697e318db36436a907e091;hb=8bc0a13623881429d06986595386200d34540d8c;hpb=3f8ff482884973a00b4c4d4e08d8cbf96a01c98b

diff --git a/error.h b/error.h
index b7352333..ff85c8d1 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 \
@@ -246,7 +246,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 +260,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 \
@@ -306,7 +306,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 \
@@ -410,7 +409,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"), \
 
@@ -440,9 +439,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"), \