X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=96a0c9a3af5062c1cc4780a2ad1de58b7f50441f;hp=e91f49b4bdc1c0f37909d22bd71642798e145b63;hb=539462ba5d5e6a5aea5cdc786085d40c4d94abc2;hpb=093dda1824631372587d107d64601389027c6187

diff --git a/error.h b/error.h
index e91f49b4..96a0c9a3 100644
--- a/error.h
+++ b/error.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
  * 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 \
@@ -269,7 +266,7 @@ extern const char **para_errlist[];
 
 
 #define AFT_ERRORS \
-	PARA_ERROR(BAD_AFSI, "invaiid afs info"), \
+	PARA_ERROR(BAD_AFSI, "invalid afs info"), \
 	PARA_ERROR(LOCALTIME, "localtime() failed"), \
 	PARA_ERROR(STRFTIME, "strftime() failed"), \
 	PARA_ERROR(BAD_PATH, "invalid path"), \
@@ -278,6 +275,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(NO_AFHI, "audio format handler info required"), \
 	PARA_ERROR(AFT_SYNTAX, "audio file table syntax error"), \
 	PARA_ERROR(HASH_MISMATCH, "hash mismatch, consider re-add"), \
+	PARA_ERROR(NO_MATCH, "no matches"), \
 
 
 #define USER_LIST_ERRORS \
@@ -301,7 +299,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 +340,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 \
@@ -581,7 +580,7 @@ extern const char **para_errlist[];
  * \return True if \a num is paraslash's representation of the system
  * error identified by \a _errno.
  */
-_static_inline_ int is_errno(int num, int _errno)
+_static_inline_ bool is_errno(int num, int _errno)
 {
 	assert(num > 0 && _errno > 0);
 	return ERRNO_TO_PARA_ERROR(_errno) == num;
@@ -626,9 +625,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}