X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=error.h;h=415262d0c2fe7507efffbe710aab153ea431fb14;hb=11688f127edbe447586de3868c268da15492a8d3;hp=5f27f1c9149e5648b0a2ff245956a0d4db8af66e;hpb=8157cf8316ef9b3769933d5b17e169b400d36da8;p=paraslash.git diff --git a/error.h b/error.h index 5f27f1c9..415262d0 100644 --- a/error.h +++ b/error.h @@ -24,13 +24,20 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define RINGBUFFER_ERRORS #define SCORE_ERRORS #define SHA1_ERRORS -#define AFH_COMMON_ERRORS #define RBTREE_ERRORS #define RECV_ERRORS #define SEND_COMMON_ERRORS extern const char **para_errlist[]; +#define AFH_ERRORS \ + PARA_ERROR(AFH_SYNTAX, "afh syntax error"), \ + + +#define AFH_COMMON_ERRORS \ + PARA_ERROR(AUDIO_FORMAT, "audio format not recognized"), \ + + #define ACL_ERRORS \ PARA_ERROR(ACL_PERM, "access denied by acl"), \ @@ -259,8 +266,6 @@ extern const char **para_errlist[]; #define STRING_ERRORS \ - PARA_ERROR(MKSTEMP, "mkstemp error: unable to create tmp file"), \ - PARA_ERROR(FCHMOD, "fchmod error: can not set mode"), \ PARA_ERROR(ATOI_OVERFLOW, "value too large"), \ PARA_ERROR(STRTOLL, "unknown strtoll error"), \ PARA_ERROR(ATOI_NO_DIGITS, "no digits found in string"), \ @@ -304,10 +309,7 @@ extern const char **para_errlist[]; #define VSS_ERRORS \ - PARA_ERROR(BAD_AUDIO_FILE_SUFFIX, "unknown suffix"), \ - PARA_ERROR(AUDIO_FORMAT, "audio format not recognized"), \ PARA_ERROR(CHUNK, "unable to get chunk"), \ - PARA_ERROR(SHORT_AFS_READ, "short read from afs socket"), \ PARA_ERROR(NOFD, "did not receive open fd from afs"), \ @@ -321,7 +323,6 @@ extern const char **para_errlist[]; #define HTTP_SEND_ERRORS \ - PARA_ERROR(WRITE_OK, "can not check whether fd is writable"), \ PARA_ERROR(MAX_CLIENTS, "maximal number of clients exceeded"), \ @@ -377,8 +378,6 @@ extern const char **para_errlist[]; PARA_ERROR(HW_PARAMS, "unable to install hw params"), \ PARA_ERROR(SW_PARAMS, "unable to install sw params"), \ PARA_ERROR(BAD_PERIOD, "can not use period equal to buffer size"), \ - PARA_ERROR(GET_XFER, "unable to obtain xfer align"), \ - PARA_ERROR(SET_XFER, "snd_pcm_sw_params_set_xfer_align() failed"), \ PARA_ERROR(ALSA_WRITE, "alsa write error"), \ PARA_ERROR(PCM_OPEN, "unable to open pcm"), \ PARA_ERROR(SND_PCM_INFO, "pcm info error"), \