X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=eb8d659b6c0f3ef6876f26c9ca4031a1d5feeaf4;hp=c28a25a39bf7da44bfb20d330765912d8912ba6b;hb=6bcdcffef00ff117eecf1b5447b9e849698d02e5;hpb=97ad8ac8735dfd7a514aa66e9de54f253440c17d

diff --git a/error.h b/error.h
index c28a25a3..eb8d659b 100644
--- a/error.h
+++ b/error.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2014 Andre Noll <maan@tuebingen.mpg.de>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -105,9 +105,11 @@ extern const char **para_errlist[];
 
 
 #define OGG_AFH_COMMON_ERRORS \
-	PARA_ERROR(STREAM_PACKETOUT, "ogg stream packet-out error (first packet)"), \
+	PARA_ERROR(STREAM_PACKETOUT, "ogg stream packet-out error"), \
+	PARA_ERROR(STREAM_PACKETIN, "ogg stream packet-in error"), \
 	PARA_ERROR(SYNC_PAGEOUT, "ogg sync page-out error (no ogg file?)"), \
-	PARA_ERROR(STREAM_PAGEIN, "ogg stream page-in error (first page)"), \
+	PARA_ERROR(STREAM_PAGEIN, "ogg stream page-in error"), \
+	PARA_ERROR(STREAM_PAGEOUT, "ogg stream page-out error"), \
 	PARA_ERROR(OGG_SYNC, "internal ogg storage overflow"), \
 	PARA_ERROR(OGG_EMPTY, "no ogg pages found"), \
 
@@ -161,7 +163,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 +211,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 +259,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 +300,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"), \
@@ -583,7 +581,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;
@@ -628,9 +626,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}