Merge branch 'maint'

[paraslash.git] / error.h

diff --git a/error.h b/error.h
index 2cca4c2ef3d86c1d3c983661a342f8c2abb9c8a6..31903062ab7be0f30d2939cb088d9da45989dd85 100644 (file)
--- a/error.h
+++ b/error.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -89,7 +89,7 @@ extern const char **para_errlist[];
 
 
 #define WAV_FILTER_ERRORS \
-       PARA_ERROR(WAV_BAD_FC, "invalid filter chain configuration"), \
+       PARA_ERROR(WAV_BAD_FC, "invalid filter configuration"), \
        PARA_ERROR(WAV_EOF, "wav filter: end of file"), \
        PARA_ERROR(WAV_SUCCESS, "successfully wrote wav header"), \
 
@@ -228,13 +228,11 @@ extern const char **para_errlist[];
        PARA_ERROR(SENDMSG, "sendmsg() failed"), \
        PARA_ERROR(RECVMSG, "recvmsg() failed"), \
        PARA_ERROR(SCM_CREDENTIALS, "did not receive SCM credentials"), \
-       PARA_ERROR(RECV_PATTERN, "did not receive expected pattern"), \
 
 
 #define UDP_RECV_ERRORS \
        PARA_ERROR(UDP_SYNTAX, "udp_recv syntax error"), \
        PARA_ERROR(UDP_OVERRUN, "output buffer overrun"), \
-       PARA_ERROR(UDP_TIMEOUT, "timeout reading on UDP socket"), \
 
 
 #define HTTP_RECV_ERRORS \
@@ -281,7 +279,6 @@ extern const char **para_errlist[];
        PARA_ERROR(OGGDEC_FAULT, "bug or heap/stack corruption"), \
        PARA_ERROR(OGGDEC_BADLINK, "invalid stream section or requested link corrupt"), \
        PARA_ERROR(OGGDEC_SYNTAX, "syntax error in oggdec config"), \
-       PARA_ERROR(OGGDEC_EOF, "oggdec: end of file"), \
 
 
 #define GRAB_CLIENT_ERRORS \
@@ -376,6 +373,8 @@ extern const char **para_errlist[];
 
 #define FD_ERRORS \
        PARA_ERROR(FGETS, "fgets error"), \
+       PARA_ERROR(EOF, "end of file"), \
+       PARA_ERROR(READ_PATTERN, "did not read expected pattern"), \
 
 
 #define WRITE_ERRORS \