X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=df2a240c24681c2d72b213183d80ccd877ffb9be;hp=4a885ec9e4b7078d43cd3cdb67507a1a0a39b754;hb=9d3d1339845435d5d7bb44b858ea6b3a94ce2cb9;hpb=c23b53b5e767a19cf000dde47294bb69cf1fc1a1

diff --git a/error.h b/error.h
index 4a885ec9..df2a240c 100644
--- a/error.h
+++ b/error.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -24,12 +24,25 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define RINGBUFFER_ERRORS
 #define SCORE_ERRORS
 #define SHA1_ERRORS
-#define AFH_COMMON_ERRORS
 #define RBTREE_ERRORS
 #define RECV_ERRORS
+#define SEND_COMMON_ERRORS
 
 extern const char **para_errlist[];
 
+#define AFH_ERRORS \
+	PARA_ERROR(AFH_SYNTAX, "afh syntax error"), \
+	PARA_ERROR(AFH_SHORT_WRITE, "afh short write"), \
+
+
+#define AFH_COMMON_ERRORS \
+	PARA_ERROR(AUDIO_FORMAT, "audio format not recognized"), \
+
+
+#define ACL_ERRORS \
+	PARA_ERROR(ACL_PERM, "access denied by acl"), \
+
+
 #define FSCK_ERRORS \
 	PARA_ERROR(FSCK_SYNTAX, "fsck syntax error"), \
 	PARA_ERROR(RANGE_VIOLATION, "range violation detected, very bad"), \
@@ -254,8 +267,6 @@ extern const char **para_errlist[];
 
 
 #define STRING_ERRORS \
-	PARA_ERROR(MKSTEMP, "mkstemp error: unable to create tmp file"), \
-	PARA_ERROR(FCHMOD, "fchmod error: can not set mode"), \
 	PARA_ERROR(ATOI_OVERFLOW, "value too large"), \
 	PARA_ERROR(STRTOLL, "unknown strtoll error"), \
 	PARA_ERROR(ATOI_NO_DIGITS, "no digits found in string"), \
@@ -299,10 +310,7 @@ extern const char **para_errlist[];
 
 
 #define VSS_ERRORS \
-	PARA_ERROR(BAD_AUDIO_FILE_SUFFIX, "unknown suffix"), \
-	PARA_ERROR(AUDIO_FORMAT, "audio format not recognized"), \
 	PARA_ERROR(CHUNK, "unable to get chunk"), \
-	PARA_ERROR(SHORT_AFS_READ, "short read from afs socket"), \
 	PARA_ERROR(NOFD, "did not receive open fd from afs"), \
 
 
@@ -316,8 +324,7 @@ extern const char **para_errlist[];
 
 
 #define HTTP_SEND_ERRORS \
-	PARA_ERROR(WRITE_OK, "can not check whether fd is writable"), \
-	PARA_ERROR(SEND_QUEUED_CHUNK, "failed to send queued chunk"), \
+	PARA_ERROR(MAX_CLIENTS, "maximal number of clients exceeded"), \
 
 
 #define COMMAND_ERRORS \
@@ -346,7 +353,6 @@ extern const char **para_errlist[];
 
 
 #define DCCP_SEND_ERRORS \
-	PARA_ERROR(DCCP_WRITE, "dccp write error"), \
 
 
 #define FD_ERRORS \
@@ -373,8 +379,6 @@ extern const char **para_errlist[];
 	PARA_ERROR(HW_PARAMS, "unable to install hw params"), \
 	PARA_ERROR(SW_PARAMS, "unable to install sw params"), \
 	PARA_ERROR(BAD_PERIOD, "can not use period equal to buffer size"), \
-	PARA_ERROR(GET_XFER, "unable to obtain xfer align"), \
-	PARA_ERROR(SET_XFER, "snd_pcm_sw_params_set_xfer_align() failed"), \
 	PARA_ERROR(ALSA_WRITE, "alsa write error"), \
 	PARA_ERROR(PCM_OPEN, "unable to open pcm"), \
 	PARA_ERROR(SND_PCM_INFO, "pcm info error"), \