X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=a63a052928fc55bf4829b70d36f838d293e760e6;hp=05e7e57ead5478a26ebcfb7d5573ade5879ea607;hb=56d75bd90d78cf44cd3984ce2a45627ef5646d38;hpb=36ec2a43a7d9c085f16544e282a439cdbaec1e00 diff --git a/error.h b/error.h index 05e7e57e..a63a0529 100644 --- a/error.h +++ b/error.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2014 Andre Noll + * Copyright (C) 2006 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -161,7 +161,6 @@ extern const char **para_errlist[]; #define PREBUFFER_FILTER_ERRORS \ - PARA_ERROR(PREBUFFER_SYNTAX, "syntax error in prebuffer filter config"), \ PARA_ERROR(PREBUFFER_SUCCESS, "prebuffering complete"), \ @@ -210,7 +209,6 @@ extern const char **para_errlist[]; #define AMP_FILTER_ERRORS \ - PARA_ERROR(AMP_SYNTAX, "syntax error in amp filter config"), \ PARA_ERROR(AMP_ZERO_AMP, "no amplification necessary"), \ PARA_ERROR(AMP_EOF, "amp: end of file"), \ @@ -259,7 +257,6 @@ 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 \ @@ -301,7 +298,6 @@ extern const char **para_errlist[]; PARA_ERROR(CLIENT_SYNTAX, "syntax error"), \ PARA_ERROR(NO_CONFIG, "config file not found"), \ PARA_ERROR(BAD_CONFIG, "syntax error in config file"), \ - PARA_ERROR(CLIENT_AUTH, "authentication failed"), \ PARA_ERROR(SERVER_EOF, "connection closed by para_server"), \ PARA_ERROR(SERVER_CMD_SUCCESS, "command terminated successfully"), \ PARA_ERROR(SERVER_CMD_FAILURE, "command failed"), \ @@ -343,6 +339,8 @@ extern const char **para_errlist[]; PARA_ERROR(NOT_PLAYING, "not playing"), \ PARA_ERROR(AUDIOD_OFF, "audiod switched off"), \ PARA_ERROR(STATUS_TIMEOUT, "status item timeout"), \ + PARA_ERROR(AUDIOD_SIGNAL, "caught deadly signal"), \ + PARA_ERROR(AUDIOD_TERM, "terminating on user request"), \ #define AUDIOD_COMMAND_ERRORS \ @@ -626,9 +624,9 @@ _static_inline_ int osl(int ret) /** * Define the error list for one subsystem. - # - * The first entry (index 0) is always the name of the subsystem - * Used by macros in config.h (generated by configure). + * + * The first entry (index 0) is always the name of the subsystem. Used by + * macros in config.h (generated by configure). */ #define DEFINE_ERRLIST(ss) const char * ss ## _ERRLIST[] = {#ss, ss ## _ERRORS}