X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=8ec328e4c57bb6d95c432dc96731244c5cc1e3bd;hp=4bc9f1555e274049d041e2895d31c1263469845f;hb=5b8e525dfb2f18a4e0d67b9da264259159ad2184;hpb=f0380a05616524b149fa34f4a0873d9063ca2a95

diff --git a/error.h b/error.h
index 4bc9f155..8ec328e4 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.
  */
@@ -27,9 +27,14 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define AFH_COMMON_ERRORS
 #define RBTREE_ERRORS
 #define RECV_ERRORS
+#define SEND_COMMON_ERRORS
 
 extern const char **para_errlist[];
 
+#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"), \
@@ -316,8 +321,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 +350,6 @@ extern const char **para_errlist[];
 
 
 #define DCCP_SEND_ERRORS \
-	PARA_ERROR(DCCP_WRITE, "dccp write error"), \
 
 
 #define FD_ERRORS \
@@ -373,8 +376,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"), \
@@ -446,27 +447,48 @@ extern const char **para_errlist[];
  */
 #define ERRNUM_TO_INDEX(num) (((1 << SS_SHIFT) - 1) & (num))
 
+/**
+ * This bit indicates whether a number is considered a system error number
+ * If yes, the system errno is just the result of clearing this bit from
+ * the given number.
+ */
 #define SYSTEM_ERROR_BIT 30
 
+/** Check whether the system error bit is set. */
 #define IS_SYSTEM_ERROR(num) (!!((num) & (1 << SYSTEM_ERROR_BIT)))
 
+/** Set the system error bit for the given number. */
 #define ERRNO_TO_PARA_ERROR(num) ((num) | (1 << SYSTEM_ERROR_BIT))
 
-static inline int is_errno(int val, int _errno)
+/** Check whether a given number is a system error number.
+ *
+ * \param num The value to be checked.
+ * \param _errno The system error number.
+ *
+ * \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)
 {
-	assert(val > 0 && _errno > 0);
-	return ERRNO_TO_PARA_ERROR(_errno) == val;
+	assert(num > 0 && _errno > 0);
+	return ERRNO_TO_PARA_ERROR(_errno) == num;
 }
 
 /**
  * Paraslash's version of strerror(3).
  *
- * Expands to the error text of \a num (a string constant).
+ * \param num The error number.
+ *
+ * \return The error text of \a num.
  */
-#define PARA_STRERROR(num) IS_SYSTEM_ERROR(num)? \
-	strerror((num) & ((1 << SYSTEM_ERROR_BIT) - 1)) : \
-	para_errlist[ERRNUM_TO_SS(num)] [ERRNUM_TO_INDEX(num)]
-
+_static_inline_ const char *para_strerror(int num)
+{
+	assert(num > 0);
+	if (IS_SYSTEM_ERROR(num))
+		return strerror((num) & ((1 << SYSTEM_ERROR_BIT) - 1));
+	else
+		return para_errlist[ERRNUM_TO_SS(num)][ERRNUM_TO_INDEX(num)];
+}
 /**
  * Define the error list for one subsystem.
  #