X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=error.h;h=b9e19f55fcabb190123cc559ae342c488403281f;hb=db2953d4922b4afb303ca73c75d53a2dbba3acd6;hp=da17ff57922adfcf2b28eeb5dd820ba708779ee2;hpb=ad8d5396323fb6c54527c5cd00a6fe39920678ed;p=paraslash.git diff --git a/error.h b/error.h index da17ff57..b9e19f55 100644 --- a/error.h +++ b/error.h @@ -24,13 +24,21 @@ 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"), \ + PARA_ERROR(AFH_SHORT_WRITE, "afh short write"), \ + + +#define AFH_COMMON_ERRORS \ + PARA_ERROR(AUDIO_FORMAT, "audio format not recognized"), \ + + #define ACL_ERRORS \ PARA_ERROR(ACL_PERM, "access denied by acl"), \ @@ -255,7 +263,6 @@ extern const char **para_errlist[]; #define SIGNAL_ERRORS \ PARA_ERROR(SIGNAL_SIG_ERR, "signal() returned SIG_ERR"), \ - PARA_ERROR(SIGNAL_READ, "read error from signal pipe"), \ #define STRING_ERRORS \ @@ -302,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"), \