X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=error.h;h=08b309ce398d8375c334eb420d6e94408a223189;hb=aa4a8d9c0f08687618dfcf96bc0c553ef17fbc1d;hp=ef54ef27707e262a09c7b638c8264cec549b2c1e;hpb=c3c862adf34ad3e504c18c5b2186fe98d4e7edd2;p=paraslash.git diff --git a/error.h b/error.h index ef54ef27..08b309ce 100644 --- a/error.h +++ b/error.h @@ -37,8 +37,13 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define VERSION_ERRORS #define SCHED_ERRORS + extern const char **para_errlist[]; +#define SYNC_FILTER_ERRORS\ + PARA_ERROR(SYNC_COMPLETE, "all buddies in sync"), \ + PARA_ERROR(SYNC_LISTEN_FD, "no fd to listen on"), \ + #define OSS_MIX_ERRORS \ PARA_ERROR(OSS_MIXER_CHANNEL, "invalid mixer channel"), \ @@ -301,6 +306,7 @@ extern const char **para_errlist[]; PARA_ERROR(SERVER_EOF, "connection closed by para_server"), \ PARA_ERROR(SERVER_CMD_SUCCESS, "command terminated successfully"), \ PARA_ERROR(SERVER_CMD_FAILURE, "command failed"), \ + PARA_ERROR(INCOMPAT_FEAT, "client/server incompatibility"), \ #define NET_ERRORS \ @@ -337,6 +343,7 @@ extern const char **para_errlist[]; PARA_ERROR(UNSUPPORTED_AUDIO_FORMAT, "given audio format not supported"), \ PARA_ERROR(NOT_PLAYING, "not playing"), \ PARA_ERROR(AUDIOD_OFF, "audiod switched off"), \ + PARA_ERROR(STATUS_TIMEOUT, "status item timeout"), \ #define AUDIOD_COMMAND_ERRORS \ @@ -464,7 +471,7 @@ extern const char **para_errlist[]; PARA_ERROR(SENDER_CMD, "command not supported by this sender"), \ PARA_ERROR(SERVER_CRASH, "para_server crashed -- can not live without it"), \ PARA_ERROR(BAD_USER, "auth request for invalid user"), \ - PARA_ERROR(BAD_FEATURE, "request for unknown or invalid feature"), \ + PARA_ERROR(BAD_FEATURE, "invalid feature request"), \ PARA_ERROR(BAD_AUTH, "authentication failure"), \ @@ -607,7 +614,7 @@ _static_inline_ const char *para_strerror(int num) * * This should be used for all calls to osl functions that return an osl error * code. It changes the return value appropriately so that it can be used for - * printing the correct error message vi para_strerror(). + * printing the correct error message with para_strerror(). * * \return \a ret if \a ret >= 0, a paraslash error code otherwise. */