X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=ea12469b236530fe3a2786af56e3659dd5d45543;hp=b735233339f1b64a89697e318db36436a907e091;hb=eacc2982fbf7e0c0b69508b57f85e839d1ba1013;hpb=a23e12ae76608a7ba3d333d8d76d5bbba0ba3ef0 diff --git a/error.h b/error.h index b7352333..ea12469b 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 \ @@ -410,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"), \ @@ -440,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"), \