X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=f6dec480c81fe5af5dfaf9ca28d57884ca1ab135;hp=ecea044ba991f566b542dce7363925855c0b73ad;hb=d54f2d11287702f99f8814961c69375c89d3dfdc;hpb=59df964251d4e6b71b4ce6d02fdbb6e11643acab diff --git a/error.h b/error.h index ecea044b..f6dec480 100644 --- a/error.h +++ b/error.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2009 Andre Noll + * Copyright (C) 2006-2010 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -33,6 +33,8 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define SERVER_COMMAND_LIST_ERRORS #define AFS_COMMAND_LIST_ERRORS #define AUDIOD_COMMAND_LIST_ERRORS +#define STDOUT_ERRORS +#define FILE_WRITE_ERRORS extern const char **para_errlist[]; @@ -42,8 +44,6 @@ extern const char **para_errlist[]; PARA_ERROR(BTR_NO_CHILD, "btr node has no children"), \ PARA_ERROR(BTR_NAVAIL, "btr node: value currently unavailable"), \ -#define STDOUT_ERRORS \ - PARA_ERROR(STDOUT_EOF, "stdout: end of file"), \ #define BITSTREAM_ERRORS \ @@ -56,7 +56,6 @@ extern const char **para_errlist[]; #define WMA_COMMON_ERRORS \ PARA_ERROR(WMA_NO_GUID, "audio stream guid not found"), \ - PARA_ERROR(WMA_BAD_ASF_HEADER, "invalid asf header"), \ #define WMADEC_FILTER_ERRORS \ @@ -137,19 +136,11 @@ extern const char **para_errlist[]; PARA_ERROR(ACL_PERM, "access denied by acl"), \ -#define FSCK_ERRORS \ - PARA_ERROR(FSCK_SYNTAX, "fsck syntax error"), \ - PARA_ERROR(RANGE_VIOLATION, "range violation detected, very bad"), \ - PARA_ERROR(NOT_A_REGULAR_FILE, "not a regular file"), \ - #define AFS_ERRORS \ PARA_ERROR(BAD_TABLE_NAME, "invalid table"), \ - PARA_ERROR(INPUT_TOO_LARGE, "input too large for stdin command"), \ PARA_ERROR(AFS_SYNTAX, "afs syntax error"), \ PARA_ERROR(AFS_SIGNAL, "afs caught deadly signal"), \ PARA_ERROR(AFS_SOCKET, "afs socket not writable"), \ - PARA_ERROR(AFS_SHORT_READ, "short read from afs socket"), \ - PARA_ERROR(OSL, "osl error"), \ #define MOOD_ERRORS \ @@ -169,6 +160,7 @@ extern const char **para_errlist[]; #define BLOB_ERRORS \ PARA_ERROR(BLOB_SYNTAX, "blob syntax error"), \ + PARA_ERROR(INPUT_TOO_LARGE, "input too large for stdin command"), \ #define PLAYLIST_ERRORS \ @@ -184,7 +176,6 @@ extern const char **para_errlist[]; PARA_ERROR(BAD_PATH, "invalid path"), \ PARA_ERROR(BAD_SORT, "invalid sorting method"), \ PARA_ERROR(FNMATCH, "fnmatch error"), \ - PARA_ERROR(NO_MATCH, "no matches"), \ 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"), \ @@ -212,7 +203,6 @@ extern const char **para_errlist[]; #define CLIENT_COMMON_ERRORS \ PARA_ERROR(CLIENT_SYNTAX, "syntax error"), \ - PARA_ERROR(INVALID_CHALLENGE, "did not receive valid challenge"), \ PARA_ERROR(NO_CONFIG, "config file not found"), \ PARA_ERROR(BAD_CONFIG, "syntax error in config file"), \ PARA_ERROR(CLIENT_AUTH, "authentication failed"), \ @@ -243,9 +233,7 @@ extern const char **para_errlist[]; #define UDP_RECV_ERRORS \ PARA_ERROR(UDP_SYNTAX, "udp_recv syntax error"), \ - PARA_ERROR(UDP_BAD_HEADER, "invalid udp audio header"), \ PARA_ERROR(UDP_OVERRUN, "output buffer overrun"), \ - PARA_ERROR(UDP_BAD_STREAM_TYPE, "invalid stream type"), \ #define HTTP_RECV_ERRORS \ @@ -276,9 +264,8 @@ extern const char **para_errlist[]; #define FILTER_COMMON_ERRORS \ - PARA_ERROR(UNSUPPORTED_FILTER, "given filter not supported"), \ PARA_ERROR(BAD_FILTER_OPTIONS, "invalid filter option given"), \ - PARA_ERROR(FC_EOF, "filter chain: eof"), \ + PARA_ERROR(UNSUPPORTED_FILTER, "given filter not supported"), \ #define STAT_ERRORS \ @@ -298,14 +285,11 @@ extern const char **para_errlist[]; #define GRAB_CLIENT_ERRORS \ PARA_ERROR(GC_WRITE, "grab client write error"), \ - PARA_ERROR(BAD_GC_SLOT, "invalid slot requested by grab client"), \ - PARA_ERROR(BAD_GC_FILTER_NUM, "invalid filter number given"), \ PARA_ERROR(GC_SYNTAX, "grab client syntax error"), \ #define MP3DEC_FILTER_ERRORS \ PARA_ERROR(MAD_FRAME_DECODE, "mad frame decode error"), \ - PARA_ERROR(MP3DEC_OVERRUN, "mp3 output buffer overrun"), \ PARA_ERROR(MP3DEC_SYNTAX, "syntax error in mp3dec config"), \ PARA_ERROR(MP3DEC_EOF, "mp3dec: end of file"), \ @@ -358,7 +342,8 @@ extern const char **para_errlist[]; #define VSS_ERRORS \ PARA_ERROR(NOFD, "did not receive open fd from afs"), \ - PARA_ERROR(BAD_CT, "invalid chunk table or bad FEC configuration") + PARA_ERROR(BAD_CT, "invalid chunk table or bad FEC configuration"), \ + PARA_ERROR(AFS_SHORT_READ, "short read from afs socket"), \ #define CRYPT_ERRORS \ @@ -367,7 +352,6 @@ extern const char **para_errlist[]; PARA_ERROR(RSA, "RSA error"), \ PARA_ERROR(ENCRYPT, "encrypt error"), \ PARA_ERROR(DECRYPT, "decrypt error"), \ - PARA_ERROR(CHALLENGE, "failed to read challenge"), \ PARA_ERROR(BLINDING, "failed to activate key blinding"), \ PARA_ERROR(KEY_PERM, "unprotected private key"), \ @@ -396,10 +380,6 @@ extern const char **para_errlist[]; #define WRITE_ERRORS \ PARA_ERROR(WRITE_SYNTAX, "para_write syntax error"), \ PARA_ERROR(NO_WAV_HEADER, "wave header not found"), \ - PARA_ERROR(WAV_HEADER_SUCCESS, "successfully read wave header"), \ - PARA_ERROR(NO_DELAY, "no initial delay"), \ - PARA_ERROR(DELAY_TIMEOUT, "initial delay timeout"), \ - PARA_ERROR(WRITE_EOF, "end of file"), \ #define ALSA_WRITE_ERRORS \ @@ -420,21 +400,14 @@ extern const char **para_errlist[]; PARA_ERROR(ALSA_EOF, "alsa: end of file"), \ -#define FILE_WRITE_ERRORS \ - PARA_ERROR(FW_WRITE, "file writer write error"), \ - PARA_ERROR(FW_NO_FILE, "task started without open file"), \ - #define WRITE_COMMON_ERRORS \ PARA_ERROR(WRITE_COMMON_SYNTAX, "syntax error in write option"), \ - PARA_ERROR(WRITE_COMMON_EOF, "write: end of file"), \ #define AACDEC_FILTER_ERRORS \ PARA_ERROR(AACDEC_INIT, "failed to init aac decoder"), \ PARA_ERROR(AAC_DECODE, "aac decode error"), \ - PARA_ERROR(AAC_OVERRUN, "aac output buffer overrun"), \ - PARA_ERROR(AACDEC_EOF, "aacdec: end of file"), \ #define CHUNK_QUEUE_ERRORS \