X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=ba18c6dcf81382f4fb4bccaa090704857c6cc9fe;hp=c53ab89a3b15192285de2f13048c4340c1fcd070;hb=b2e6a24448a9e49e0766ab4f32163580eeff469e;hpb=09b7971c7a862924d4ce669f8a33bda567ba570b;ds=sidebyside

diff --git a/error.h b/error.h
index c53ab89a..ba18c6dc 100644
--- a/error.h
+++ b/error.h
@@ -6,6 +6,8 @@
 
 /** \file error.h List of error messages for all subsystems. */
 
+#include <osl.h>
+
 /** \cond */
 
 /* List of all subsystems that use paraslash's error facility. */
@@ -100,46 +102,6 @@ extern const char **para_errlist[];
 	PARA_ERROR(RANGE_VIOLATION, "range violation detected, very bad"), \
 	PARA_ERROR(NOT_A_REGULAR_FILE, "not a regular file"), \
 
-
-#define OSL_ERRORS \
-	PARA_ERROR(BAD_DB_DIR, "invalid database directory"), \
-	PARA_ERROR(NO_COLUMN_DESC, "missing column description"), \
-	PARA_ERROR(BAD_NAME, "invalid name for a column/table"), \
-	PARA_ERROR(BAD_STORAGE_TYPE, "invalid storage type"), \
-	PARA_ERROR(BAD_STORAGE_FLAGS, "invalid storage flags"), \
-	PARA_ERROR(NO_COLUMN_NAME, "missing column name"), \
-	PARA_ERROR(NO_COLUMNS, "at least one column required"), \
-	PARA_ERROR(BAD_COLUMN_NAME, "invalid name for a table column"), \
-	PARA_ERROR(NO_UNIQUE_RBTREE_COLUMN, "need at least one mapped column with OSL_UNIQE and OSL_RBTREE OSL"), \
-	PARA_ERROR(NO_RBTREE_COL, "at least one column needs an rbtree"), \
-	PARA_ERROR(DUPLICATE_COL_NAME, "column name given twice"), \
-	PARA_ERROR(BAD_STORAGE_SIZE, "invalid storage size"), \
-	PARA_ERROR(NO_COMPARE_FUNC, "missing compare function"), \
-	PARA_ERROR(BAD_DATA_SIZE, "wrong data size for fixed-size column"), \
-	PARA_ERROR(NOT_MAPPED, "file not mapped"), \
-	PARA_ERROR(ALREADY_MAPPED, "file already mapped"), \
-	PARA_ERROR(BAD_SIZE, "invalid size specified"), \
-	PARA_ERROR(TRUNC, "failed to truncate file"), \
-	PARA_ERROR(BAD_TABLE, "table not open"), \
-	PARA_ERROR(BAD_TABLE_DESC, "invalid table description"), \
-	PARA_ERROR(RB_KEY_EXISTS, "key already exists in rbtree"), \
-	PARA_ERROR(RB_KEY_NOT_FOUND, "key not found in rbtree"), \
-	PARA_ERROR(BAD_ROW_NUM, "invalid row number"), \
-	PARA_ERROR(INDEX_CORRUPTION, "index corruption detected"), \
-	PARA_ERROR(INVALID_OBJECT, "reference to invalid object"), \
-	PARA_ERROR(STAT, "can not stat file"), \
-	PARA_ERROR(WRITE, "write error"), \
-	PARA_ERROR(LSEEK, "lseek error"), \
-	PARA_ERROR(BUSY, "table is busy"), \
-	PARA_ERROR(SHORT_TABLE, "table too short"), \
-	PARA_ERROR(NO_MAGIC, "missing table header magic"), \
-	PARA_ERROR(VERSION_MISMATCH, "table version not supported"), \
-	PARA_ERROR(BAD_COLUMN_NUM, "invalid column number"), \
-	PARA_ERROR(BAD_TABLE_FLAGS, "invalid flags in table description"), \
-	PARA_ERROR(BAD_ROW, "invalid row"), \
-
-
-
 #define AFS_ERRORS \
 	PARA_ERROR(BAD_TABLE_NAME, "invalid table"), \
 	PARA_ERROR(INPUT_TOO_LARGE, "input too large for stdin command"), \
@@ -147,6 +109,7 @@ extern const char **para_errlist[];
 	PARA_ERROR(AFS_SIGNAL, "afs caught deadly signal"), \
 	PARA_ERROR(AFS_SOCKET, "afs socket not writable"), \
 	PARA_ERROR(AFS_SHORT_READ, "short read from afs socket"), \
+	PARA_ERROR(OSL, "osl error"), \
 
 
 #define MOOD_ERRORS \
@@ -479,12 +442,23 @@ extern const char **para_errlist[];
  */
 #define SYSTEM_ERROR_BIT 30
 
+/**
+ * Like the SYSTEM_ERROR_BIT, but indicates an error from the osl library.
+ */
+#define OSL_ERROR_BIT 29
+
 /** Check whether the system error bit is set. */
 #define IS_SYSTEM_ERROR(num) (!!((num) & (1 << SYSTEM_ERROR_BIT)))
 
+/** Check whether the osl error bit is set. */
+#define IS_OSL_ERROR(num) (!!((num) & (1 << OSL_ERROR_BIT)))
+
 /** Set the system error bit for the given number. */
 #define ERRNO_TO_PARA_ERROR(num) ((num) | (1 << SYSTEM_ERROR_BIT))
 
+/** Set the osl error bit for the given number. */
+#define OSL_ERRNO_TO_PARA_ERROR(num) ((num) | (1 << OSL_ERROR_BIT))
+
 /** Check whether a given number is a system error number.
  *
  * \param num The value to be checked.
@@ -509,11 +483,32 @@ _static_inline_ int is_errno(int num, int _errno)
 _static_inline_ const char *para_strerror(int num)
 {
 	assert(num > 0);
+	if (IS_OSL_ERROR(num))
+		return osl_strerror(num & ((1 << OSL_ERROR_BIT) - 1));
 	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)];
+		return strerror(num & ((1 << SYSTEM_ERROR_BIT) - 1));
+	return para_errlist[ERRNUM_TO_SS(num)][ERRNUM_TO_INDEX(num)];
 }
+
+/**
+ * Wrapper for osl library calls.
+ *
+ * \param ret The return value of an osl library function.
+ *
+ * This should be used for all calls to osl functions that return an osl error
+ * code. It changes the return value to \p -E_OSL appropriately so that it can
+ * be used for printing the correct error message.
+ *
+ * \return \a ret if \a ret >= 0, \p -E_OSL otherwise.
+ */
+_static_inline_ int osl(int ret)
+{
+	if (ret >= 0)
+		return ret;
+	return OSL_ERRNO_TO_PARA_ERROR(-ret);
+}
+
+
 /**
  * Define the error list for one subsystem.
  #