X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=error.h;h=b9e19f55fcabb190123cc559ae342c488403281f;hb=68f0d202714b85c9b5e649dcefc41df58fe8e31e;hp=b0dbdbbb2bc4f33ff851916fa2f36f701243fb51;hpb=bc8ceae5cf97e2829fe5ef30300d4b7aa3a67281;p=paraslash.git diff --git a/error.h b/error.h index b0dbdbbb..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,12 +263,9 @@ 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 \ - 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"), \