X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=osl.c;h=e1b535c563b7ae99570950f7c0152be2f3412883;hp=1d5db11ef4c65b32bca5f546596b5d1668262d5c;hb=8f8ea26e0fb2fcc1fbe584f6e7fe3b9b6199d555;hpb=c870a921193000e3a5123ee4037a81c18218aea5

diff --git a/osl.c b/osl.c
index 1d5db11..e1b535c 100644
--- a/osl.c
+++ b/osl.c
@@ -10,6 +10,7 @@
 
 
 #include "log.h"
+#include "osl.h"
 #include "error.h"
 #include "fd.h"
 #include "list.h"
@@ -60,6 +61,35 @@ static __must_check __printf_1_2 __malloc char *make_message(const char *fmt, ..
 	return p;
 }
 
+/* Taken from Drepper: How to write shared libraries, Appendix B. */
+#include <stddef.h>
+#define MSGSTRFIELD(line) MSGSTRFIELD1(line)
+#define MSGSTRFIELD1(line) str##line
+static const union msgstr_t {
+	struct {
+#define _S(n, s) char MSGSTRFIELD(__LINE__)[sizeof(s)];
+#include "errtab.h"
+#undef _S
+	};
+	char str[0];
+} msgstr = { {
+#define _S(n, s) s,
+#include "errtab.h"
+#undef _S
+} };
+static const unsigned int errmsgidx[] = {
+#define _S(n, s) [n] = offsetof(union msgstr_t, MSGSTRFIELD(__LINE__)),
+#include "errtab.h"
+#undef _S
+};
+
+__export const char *osl_strerror(int num)
+{
+	if (IS_SYSTEM_ERROR(num))
+		return strerror((num) & ((1 << SYSTEM_ERROR_BIT) - 1));
+	return msgstr.str + errmsgidx[num];
+}
+
 /**
  * The log function.
  *
@@ -100,14 +130,14 @@ __printf_2_3 void __log(int ll, const char* fmt,...)
  * contains the resulting offset location as measured in bytes from the
  * beginning of the file.
  *
- * \return Positive on success. Otherwise, the function returns \p -E_LSEEK.
+ * \return Positive on success. Otherwise, the function returns \p -E_OSL_LSEEK.
  *
  * \sa lseek(2).
  */
 static int __lseek(int fd, off_t *offset, int whence)
 {
 	*offset = lseek(fd, *offset, whence);
-	int ret = -E_LSEEK;
+	int ret = -E_OSL_LSEEK;
 	if (*offset == -1)
 		return ret;
 	return 1;
@@ -124,7 +154,7 @@ static int __lseek(int fd, off_t *offset, int whence)
  * occurred during the write.
  *
  * \return On success, the number of bytes written is returned, otherwise, the
- * function returns \p -E_WRITE.
+ * function returns \p -E_OSL_WRITE.
  *
  * \sa write(2).
  */
@@ -136,7 +166,7 @@ static ssize_t __write(int fd, const void *buf, size_t size)
 		ret = write(fd, buf, size);
 		if ((ret < 0) && (errno == EAGAIN || errno == EINTR))
 			continue;
-		return ret >= 0? ret : -E_WRITE;
+		return ret >= 0? ret : -E_OSL_WRITE;
 	}
 }
 
@@ -176,16 +206,13 @@ static ssize_t write_all(int fd, const void *buf, size_t size)
  * \param buf The buffer to write to the file.
  * \param size The size of \a buf.
  *
- * \return Positive on success, negative on errors. Possible errors include:
- * any errors from para_open() or para_write().
- *
- * \sa para_open(), para_write().
+ * \return Standard.
  */
 static int write_file(const char *filename, const void *buf, size_t size)
 {
 	int ret, fd;
 
-	ret = para_open(filename, O_WRONLY | O_CREAT | O_EXCL, 0644);
+	ret = osl_open(filename, O_WRONLY | O_CREAT | O_EXCL, 0644);
 	if (ret < 0)
 		return ret;
 	fd = ret;
@@ -204,7 +231,7 @@ static int append_file(const char *filename, char *header, size_t header_size,
 	int ret, fd;
 
 //	DEBUG_LOG("appending %zu  + %zu bytes\n", header_size, data_size);
-	ret = para_open(filename, O_WRONLY | O_CREAT | O_APPEND, 0644);
+	ret = osl_open(filename, O_WRONLY | O_CREAT | O_APPEND, 0644);
 	if (ret < 0)
 		return ret;
 	fd = ret;
@@ -233,40 +260,18 @@ out:
 static int verify_name(const char *name)
 {
 	if (!name)
-		return -E_BAD_NAME;
+		return -E_OSL_BAD_NAME;
 	if (!*name)
-		return -E_BAD_NAME;
+		return -E_OSL_BAD_NAME;
 	if (strchr(name, '/'))
-		return -E_BAD_NAME;
+		return -E_OSL_BAD_NAME;
 	if (!strcmp(name, ".."))
-		return -E_BAD_NAME;
+		return -E_OSL_BAD_NAME;
 	if (!strcmp(name, "."))
-		return -E_BAD_NAME;
+		return -E_OSL_BAD_NAME;
 	return 1;
 }
 
-/**
- * Compare two osl objects pointing to unsigned integers of 32 bit size.
- *
- * \param obj1 Pointer to the first integer.
- * \param obj2 Pointer to the second integer.
- *
- * \return The values required for an osl compare function.
- *
- * \sa osl_compare_func, osl_hash_compare().
- */
-int uint32_compare(const struct osl_object *obj1, const struct osl_object *obj2)
-{
-	uint32_t d1 = read_u32((const char *)obj1->data);
-	uint32_t d2 = read_u32((const char *)obj2->data);
-
-	if (d1 < d2)
-		return 1;
-	if (d1 > d2)
-		return -1;
-	return 0;
-}
-
 /**
  * Compare two osl objects pointing to hash values.
  *
@@ -328,11 +333,11 @@ static int init_column_descriptions(struct osl_table *t)
 	int i, j, ret;
 	const struct osl_column_description *cd;
 
-	ret = -E_BAD_TABLE_DESC;
+	ret = -E_OSL_BAD_TABLE_DESC;
 	ret = verify_name(t->desc->name);
 	if (ret < 0)
 		goto err;
-	ret = -E_BAD_DB_DIR;
+	ret = -E_OSL_BAD_DB_DIR;
 	if (!t->desc->dir && (t->num_disk_storage_columns || t->num_mapped_columns))
 		goto err;
 	/* the size of the index header without column descriptions */
@@ -341,11 +346,11 @@ static int init_column_descriptions(struct osl_table *t)
 		struct osl_column *col = t->columns + i;
 		if (cd->storage_flags & OSL_RBTREE) {
 			if (!cd->compare_function)
-				return -E_NO_COMPARE_FUNC;
+				return -E_OSL_NO_COMPARE_FUNC;
 		}
 		if (cd->storage_type == OSL_NO_STORAGE)
 			continue;
-		ret = -E_NO_COLUMN_NAME;
+		ret = -E_OSL_NO_COLUMN_NAME;
 		if (!cd->name || !cd->name[0])
 			goto err;
 		ret = verify_name(cd->name);
@@ -353,7 +358,7 @@ static int init_column_descriptions(struct osl_table *t)
 			goto err;
 		t->index_header_size += index_column_description_size(cd->name);
 		column_name_hash(cd->name, col->name_hash);
-		ret = -E_DUPLICATE_COL_NAME;
+		ret = -E_OSL_DUPLICATE_COL_NAME;
 		for (j = i + 1; j < t->desc->num_columns; j++) {
 			const char *name2 = get_column_description(t->desc,
 				j)->name;
@@ -376,10 +381,7 @@ err:
  * of these tests fail. On success, a struct \p osl_table is allocated and
  * initialized with data derived from \p desc.
  *
- * \return Positive on success, negative on errors. Possible errors include: \p
- * E_BAD_TABLE_DESC, \p E_NO_COLUMN_DESC, \p E_NO_COLUMNS, \p
- * E_BAD_STORAGE_TYPE, \p E_BAD_STORAGE_FLAGS, \p E_BAD_STORAGE_SIZE, \p
- * E_NO_UNIQUE_RBTREE_COLUMN, \p E_NO_RBTREE_COL.
+ * \return Standard.
  *
  * \sa struct osl_table.
  */
@@ -392,15 +394,15 @@ int init_table_structure(const struct osl_table_description *desc,
 
 	if (!t)
 		return ret;
-	ret = -E_BAD_TABLE_DESC;
+	ret = -E_OSL_BAD_TABLE_DESC;
 	if (!desc)
 		goto err;
 	DEBUG_LOG("creating table structure for '%s' from table "
 		"description\n", desc->name);
-	ret = -E_NO_COLUMN_DESC;
+	ret = -E_OSL_NO_COLUMN_DESC;
 	if (!desc->column_descriptions)
 		goto err;
-	ret = -E_NO_COLUMNS;
+	ret = -E_OSL_NO_COLUMNS;
 	if (!desc->num_columns)
 		goto err;
 	ret = -ERRNO_TO_ERROR(ENOMEM);
@@ -413,14 +415,14 @@ int init_table_structure(const struct osl_table_description *desc,
 		enum osl_storage_flags sf = cd->storage_flags;
 		struct osl_column *col = &t->columns[i];
 
-		ret = -E_BAD_STORAGE_TYPE;
+		ret = -E_OSL_BAD_STORAGE_TYPE;
 		if (st != OSL_MAPPED_STORAGE && st != OSL_DISK_STORAGE
 				&& st != OSL_NO_STORAGE)
 			goto err;
-		ret = -E_BAD_STORAGE_FLAGS;
+		ret = -E_OSL_BAD_STORAGE_FLAGS;
 		if (st == OSL_DISK_STORAGE && sf & OSL_RBTREE)
 			goto err;
-		ret = -E_BAD_STORAGE_SIZE;
+		ret = -E_OSL_BAD_STORAGE_SIZE;
 		if (sf & OSL_FIXED_SIZE && !cd->data_size)
 			goto err;
 		switch (st) {
@@ -447,10 +449,10 @@ int init_table_structure(const struct osl_table_description *desc,
 			}
 		}
 	}
-	ret = -E_NO_UNIQUE_RBTREE_COLUMN;
+	ret = -E_OSL_NO_UNIQUE_RBTREE_COLUMN;
 	if (t->num_disk_storage_columns && !have_disk_storage_name_column)
 		goto err;
-	ret = -E_NO_RBTREE_COL;
+	ret = -E_OSL_NO_RBTREE_COL;
 	if (!t->num_rbtrees)
 		goto err;
 	/* success */
@@ -475,7 +477,7 @@ err:
  * Read the index header, check for the paraslash magic string and the table version number.
  * Read all information stored in the index header into \a desc.
  *
- * \return Positive on success, negative on errors.
+ * \return Standard.
  *
  * \sa struct osl_table_description, osl_create_table.
  */
@@ -489,20 +491,20 @@ int read_table_desc(struct osl_object *map, struct osl_table_description *desc)
 	struct osl_column_description *cd;
 
 	if (map->size < MIN_INDEX_HEADER_SIZE(1))
-		return -E_SHORT_TABLE;
+		return -E_OSL_SHORT_TABLE;
 	if (strncmp(buf + IDX_PARA_MAGIC, PARA_MAGIC, strlen(PARA_MAGIC)))
-		return -E_NO_MAGIC;
+		return -E_OSL_NO_MAGIC;
 	version = read_u8(buf + IDX_VERSION);
 	if (version < MIN_TABLE_VERSION || version > MAX_TABLE_VERSION)
-		return -E_VERSION_MISMATCH;
+		return -E_OSL_VERSION_MISMATCH;
 	desc->flags = read_u8(buf + IDX_TABLE_FLAGS);
 	desc->num_columns = read_u16(buf + IDX_NUM_COLUMNS);
 	DEBUG_LOG("%u columns\n", desc->num_columns);
 	if (!desc->num_columns)
-		return -E_NO_COLUMNS;
+		return -E_OSL_NO_COLUMNS;
 	header_size = read_u16(buf + IDX_HEADER_SIZE);
 	if (map->size < header_size)
-		return -E_BAD_SIZE;
+		return -E_OSL_BAD_SIZE;
 	desc->column_descriptions = calloc(desc->num_columns,
 		sizeof(struct osl_column_description));
 	if (!desc->column_descriptions)
@@ -511,7 +513,7 @@ int read_table_desc(struct osl_object *map, struct osl_table_description *desc)
 	FOR_EACH_COLUMN(i, desc, cd) {
 		char *null_byte;
 
-		ret = -E_SHORT_TABLE;
+		ret = -E_OSL_SHORT_TABLE;
 		if (map->size < offset + MIN_IDX_COLUMN_DESCRIPTION_SIZE) {
 			ERROR_LOG("map size = %zu < %u = offset + min desc size\n",
 				map->size, offset + MIN_IDX_COLUMN_DESCRIPTION_SIZE);
@@ -523,7 +525,7 @@ int read_table_desc(struct osl_object *map, struct osl_table_description *desc)
 		cd->data_size = read_u32(buf + offset + IDX_CD_DATA_SIZE);
 		null_byte = memchr(buf + offset + IDX_CD_NAME, '\0',
 			map->size - offset - IDX_CD_NAME);
-		ret = -E_INDEX_CORRUPTION;
+		ret = -E_OSL_INDEX_CORRUPTION;
 		if (!null_byte)
 			goto err;
 		ret = -ERRNO_TO_ERROR(ENOMEM);
@@ -533,7 +535,7 @@ int read_table_desc(struct osl_object *map, struct osl_table_description *desc)
 		offset += index_column_description_size(cd->name);
 	}
 	if (offset != header_size) {
-		ret = -E_INDEX_CORRUPTION;
+		ret = -E_OSL_INDEX_CORRUPTION;
 		ERROR_LOG("real header size = %u != %u = stored header size\n",
 			offset, header_size);
 		goto err;
@@ -559,10 +561,10 @@ static int compare_table_descriptions(struct osl_table *t)
 	ret = read_table_desc(&t->index_map, &desc);
 	if (ret < 0)
 		return ret;
-	ret = -E_BAD_TABLE_FLAGS;
+	ret = -E_OSL_BAD_TABLE_FLAGS;
 	if (desc.flags != t->desc->flags)
 		goto out;
-	ret = -E_BAD_COLUMN_NUM;
+	ret = -E_OSL_BAD_COLUMN_NUM;
 	if (desc.num_columns > t->desc->num_columns)
 		goto out;
 	if (desc.num_columns < t->desc->num_columns) {
@@ -583,22 +585,22 @@ static int compare_table_descriptions(struct osl_table *t)
 	}
 	FOR_EACH_COLUMN(i, t->desc, cd1) {
 		cd2 = get_column_description(&desc, i);
-		ret = -E_BAD_STORAGE_TYPE;
+		ret = -E_OSL_BAD_STORAGE_TYPE;
 		if (cd1->storage_type != cd2->storage_type)
 			goto out;
 		if (cd1->storage_type == OSL_NO_STORAGE)
 			continue;
-		ret = -E_BAD_STORAGE_FLAGS;
+		ret = -E_OSL_BAD_STORAGE_FLAGS;
 		if (cd1->storage_flags != cd2->storage_flags) {
 			ERROR_LOG("sf1 = %u != %u = sf2\n",
 				cd1->storage_flags, cd2->storage_flags);
 			goto out;
 		}
-		ret = -E_BAD_DATA_SIZE;
+		ret = -E_OSL_BAD_DATA_SIZE;
 		if (cd1->storage_flags & OSL_FIXED_SIZE)
 			if (cd1->data_size != cd2->data_size)
 				goto out;
-		ret = -E_BAD_COLUMN_NAME;
+		ret = -E_OSL_BAD_COLUMN_NAME;
 		if (strcmp(cd1->name, cd2->name))
 			goto out;
 	}
@@ -664,7 +666,7 @@ static int create_table_index(struct osl_table *t)
  *
  * \return Standard.
  */
-int osl_create_table(const struct osl_table_description *desc)
+__export int osl_create_table(const struct osl_table_description *desc)
 {
 	const struct osl_column_description *cd;
 	char *table_dir = NULL, *filename;
@@ -696,7 +698,7 @@ int osl_create_table(const struct osl_table_description *desc)
 			goto out;
 		INFO_LOG("filename: %s\n", filename);
 		if (cd->storage_type == OSL_MAPPED_STORAGE) {
-			ret = para_open(filename, O_RDWR | O_CREAT | O_EXCL,
+			ret = osl_open(filename, O_RDWR | O_CREAT | O_EXCL,
 				0644);
 			free(filename);
 			if (ret < 0)
@@ -773,7 +775,7 @@ int unmap_table(struct osl_table *t, enum osl_close_flags flags)
 		return 1;
 	DEBUG_LOG("unmapping table '%s'\n", t->desc->name);
 	if (!t->index_map.data)
-		return -E_NOT_MAPPED;
+		return -E_OSL_NOT_MAPPED;
 	if (flags & OSL_MARK_CLEAN)
 		mark_table_clean(t);
 	ret = para_munmap(t->index_map.data, t->index_map.size);
@@ -791,7 +793,7 @@ static int map_column(struct osl_table *t, unsigned col_num)
 {
 	struct stat statbuf;
 	char *filename = column_filename(t, col_num);
-	int ret = -E_STAT;
+	int ret = -E_OSL_STAT;
 
 	if (!filename)
 		return -ERRNO_TO_ERROR(ENOMEM);
@@ -831,7 +833,7 @@ int map_table(struct osl_table *t, enum map_table_flags flags)
 	if (!t->num_mapped_columns)
 		return 0;
 	if (t->index_map.data)
-		return -E_ALREADY_MAPPED;
+		return -E_OSL_ALREADY_MAPPED;
 	filename = index_filename(t->desc);
 	if (!filename)
 		return -ERRNO_TO_ERROR(ENOMEM);
@@ -846,7 +848,7 @@ int map_table(struct osl_table *t, enum map_table_flags flags)
 		if (ret < 0)
 			goto err;
 	}
-	ret = -E_BUSY;
+	ret = -E_OSL_BUSY;
 	if (!(flags & MAP_TBL_FL_IGNORE_DIRTY)) {
 		if (table_is_dirty(t)) {
 			ERROR_LOG("%s is dirty\n", t->desc->name);
@@ -886,8 +888,7 @@ err:	/* unmap what is already mapped */
  * It is considered an error if \a col_num does not refer to a column
  * of storage type \p OSL_MAPPED_STORAGE.
  *
- * \return Positive on success, negative on errors. Possible errors include:
- * \p E_BAD_ROW_NUM, \p E_INVALID_OBJECT.
+ * \return Standard.
  *
  * \sa osl_storage_type.
  */
@@ -901,7 +902,7 @@ int get_mapped_object(const struct osl_table *t, unsigned col_num,
 	int ret;
 
 	if (t->num_rows <= row_num)
-		return -E_BAD_ROW_NUM;
+		return -E_OSL_BAD_ROW_NUM;
 	ret = get_cell_index(t, row_num, col_num, &cell_index);
 	if (ret < 0)
 		return ret;
@@ -912,7 +913,7 @@ int get_mapped_object(const struct osl_table *t, unsigned col_num,
 	if (read_u8(header) == 0xff) {
 		ERROR_LOG("col %u, size %zu, offset %u\n", col_num,
 			obj->size, offset);
-		return -E_INVALID_OBJECT;
+		return -E_OSL_INVALID_OBJECT;
 	}
 	return 1;
 }
@@ -955,7 +956,7 @@ static int search_rbtree(const struct osl_object *obj,
 		*result = parent;
 	if (rb_link)
 		*rb_link = new;
-	return -E_RB_KEY_NOT_FOUND;
+	return -E_OSL_RB_KEY_NOT_FOUND;
 }
 
 static int insert_rbtree(struct osl_table *t, unsigned col_num,
@@ -967,7 +968,7 @@ static int insert_rbtree(struct osl_table *t, unsigned col_num,
 	int ret = search_rbtree(obj, t, col_num, &parent, &rb_link);
 
 	if (ret > 0)
-		return -E_RB_KEY_EXISTS;
+		return -E_OSL_RB_KEY_EXISTS;
 	rbtree_num = t->columns[col_num].rbtree_num;
 	n = get_rb_node_pointer(row, rbtree_num);
 	rb_link_node(n, parent, rb_link);
@@ -1110,17 +1111,16 @@ void clear_rbtrees(struct osl_table *t)
  * passed to this function in order to flush all changes to the file system and
  * to free the resources that were allocated by osl_open_table().
  *
- * \return Positive on success, negative on errors. Possible errors: \p E_BAD_TABLE,
- * errors returned by unmap_table().
+ * \return Standard.
  *
  * \sa osl_open_table(), unmap_table().
  */
-int osl_close_table(struct osl_table *t, enum osl_close_flags flags)
+__export int osl_close_table(struct osl_table *t, enum osl_close_flags flags)
 {
 	int ret;
 
 	if (!t)
-		return -E_BAD_TABLE;
+		return -E_OSL_BAD_TABLE;
 	free_volatile_objects(t, flags);
 	clear_rbtrees(t);
 	ret = unmap_table(t, flags);
@@ -1167,7 +1167,7 @@ int row_is_invalid(struct osl_table *t, uint32_t row_num)
  * This function marks each mapped object in the index entry of \a row as
  * invalid.
  *
- * \return Positive on success, negative on errors.
+ * \return Standard.
  */
 int mark_row_invalid(struct osl_table *t, uint32_t row_num)
 {
@@ -1186,7 +1186,7 @@ int mark_row_invalid(struct osl_table *t, uint32_t row_num)
  *
  * \param t The table containing the rbtrees to be initialized.
  *
- * \return Positive on success, negative on errors.
+ * \return Standard.
  */
 int init_rbtrees(struct osl_table *t)
 {
@@ -1226,7 +1226,7 @@ int init_rbtrees(struct osl_table *t)
  *
  * \return Standard.
  */
-int osl_open_table(const struct osl_table_description *table_desc,
+__export int osl_open_table(const struct osl_table_description *table_desc,
 		struct osl_table **result)
 {
 	int i, ret;
@@ -1347,8 +1347,7 @@ static int append_row_index(const struct osl_table *t, char *row_index)
  *
  * Truncate the regular file named by \a path by \a size bytes.
  *
- * \return Positive on success, negative on errors. Possible errors include: \p
- * E_STAT, \p E_BAD_SIZE, \p E_TRUNC.
+ * \return Standard.
  *
  * \sa truncate(2)
  */
@@ -1357,13 +1356,13 @@ int para_truncate(const char *path, off_t size)
 	int ret;
 	struct stat statbuf;
 
-	ret = -E_STAT;
+	ret = -E_OSL_STAT;
 	if (stat(path, &statbuf) < 0)
 		goto out;
-	ret = -E_BAD_SIZE;
+	ret = -E_OSL_BAD_SIZE;
 	if (statbuf.st_size < size)
 		goto out;
-	ret = -E_TRUNC;
+	ret = -E_OSL_TRUNC;
 	if (truncate(path, statbuf.st_size - size) < 0)
 		goto out;
 	ret = 1;
@@ -1426,13 +1425,11 @@ static int delete_disk_storage_file(const struct osl_table *t, unsigned col_num,
  * rbtree if this object is equal to an object already contained in that column
  * (i.e. the compare function for the column's rbtree returns zero).
  *
- * Possible errors include: \p E_RB_KEY_EXISTS, \p E_BAD_DATA_SIZE.
- *
- * \return Positive on success, negative on errors.
+ * \return Standard.
  *
  * \sa struct osl_table_description, osl_compare_func, osl_add_row().
  */
-int osl_add_and_get_row(struct osl_table *t, struct osl_object *objects,
+__export int osl_add_and_get_row(struct osl_table *t, struct osl_object *objects,
 		struct osl_row **row)
 {
 	int i, ret;
@@ -1443,7 +1440,7 @@ int osl_add_and_get_row(struct osl_table *t, struct osl_object *objects,
 	const struct osl_column_description *cd;
 
 	if (!t)
-		return -E_BAD_TABLE;
+		return -E_OSL_BAD_TABLE;
 	rb_parents = malloc(t->num_rbtrees * sizeof(struct rn_node*));
 	if (!rb_parents)
 		return -ERRNO_TO_ERROR(ENOMEM);
@@ -1467,14 +1464,14 @@ int osl_add_and_get_row(struct osl_table *t, struct osl_object *objects,
 		enum osl_storage_type st = cd->storage_type;
 		enum osl_storage_flags sf = cd->storage_flags;
 
-//		ret = -E_NULL_OBJECT;
+//		ret = -E_OSL_NULL_OBJECT;
 //		if (!objects[i])
 //			goto out;
 		if (st == OSL_DISK_STORAGE)
 			continue;
 		if (sf & OSL_RBTREE) {
 			unsigned rbtree_num = t->columns[i].rbtree_num;
-			ret = -E_RB_KEY_EXISTS;
+			ret = -E_OSL_RB_KEY_EXISTS;
 //			DEBUG_LOG("checking whether %p exists\n",
 //				objects[i].data);
 			if (search_rbtree(objects + i, t, i,
@@ -1485,7 +1482,7 @@ int osl_add_and_get_row(struct osl_table *t, struct osl_object *objects,
 		if (sf & OSL_FIXED_SIZE) {
 //			DEBUG_LOG("fixed size. need: %zu, have: %d\n",
 //				objects[i].size, cd->data_size);
-			ret = -E_BAD_DATA_SIZE;
+			ret = -E_OSL_BAD_DATA_SIZE;
 			if (objects[i].size != cd->data_size)
 				goto out;
 		}
@@ -1584,7 +1581,7 @@ out:
  *
  * This is equivalent to osl_add_and_get_row(t, objects, NULL).
  */
-int osl_add_row(struct osl_table *t, struct osl_object *objects)
+__export int osl_add_row(struct osl_table *t, struct osl_object *objects)
 {
 	return osl_add_and_get_row(t, objects, NULL);
 }
@@ -1601,22 +1598,21 @@ int osl_add_row(struct osl_table *t, struct osl_object *objects)
  * or \p OSL_NO_STORAGE, i.e. no disk storage objects may be retrieved by this
  * function.
  *
- * \return Positive if object was found, negative on errors. Possible errors
- * include: \p E_BAD_TABLE, \p E_BAD_STORAGE_TYPE.
+ * \return Standard.
  *
  * \sa osl_storage_type, osl_open_disk_object().
  */
-int osl_get_object(const struct osl_table *t, const struct osl_row *r,
+__export int osl_get_object(const struct osl_table *t, const struct osl_row *r,
 	unsigned col_num, struct osl_object *object)
 {
 	const struct osl_column_description *cd;
 
 	if (!t)
-		return -E_BAD_TABLE;
+		return -E_OSL_BAD_TABLE;
 	cd = get_column_description(t->desc, col_num);
 	/* col must not be disk storage */
 	if (cd->storage_type == OSL_DISK_STORAGE)
-		return -E_BAD_STORAGE_TYPE;
+		return -E_OSL_BAD_STORAGE_TYPE;
 	if (cd->storage_type == OSL_MAPPED_STORAGE)
 		return get_mapped_object(t, col_num, r->num, object);
 	/* volatile */
@@ -1650,17 +1646,16 @@ static int mark_mapped_object_invalid(const struct osl_table *t,
  * data is merely marked invalid and may be pruned from time to time by
  * para_fsck.
  *
- * \return Positive on success, negative on errors. Possible errors include:
- * \p E_BAD_TABLE, errors returned by osl_get_object().
+ * \return Standard.
  */
-int osl_del_row(struct osl_table *t, struct osl_row *row)
+__export int osl_del_row(struct osl_table *t, struct osl_row *row)
 {
 	struct osl_row *r = row;
 	int i, ret;
 	const struct osl_column_description *cd;
 
 	if (!t)
-		return -E_BAD_TABLE;
+		return -E_OSL_BAD_TABLE;
 	INFO_LOG("deleting row %p\n", row);
 
 	if (t->num_disk_storage_columns) {
@@ -1702,9 +1697,9 @@ static int check_rbtree_col(const struct osl_table *t, unsigned col_num,
 		struct osl_column **col)
 {
 	if (!t)
-		return -E_BAD_TABLE;
+		return -E_OSL_BAD_TABLE;
 	if (!(get_column_description(t->desc, col_num)->storage_flags & OSL_RBTREE))
-		return -E_BAD_STORAGE_FLAGS;
+		return -E_OSL_BAD_STORAGE_FLAGS;
 	*col = t->columns + col_num;
 	return 1;
 }
@@ -1720,14 +1715,11 @@ static int check_rbtree_col(const struct osl_table *t, unsigned col_num,
  * Lookup \a obj in \a t and return the row containing \a obj. The column
  * specified by \a col_num must have an associated rbtree.
  *
- * \return Positive on success, negative on errors. If an error occurred, \a
- * result is set to \p NULL. Possible errors include: \p E_BAD_TABLE, \p
- * E_BAD_STORAGE_FLAGS, errors returned by get_mapped_object(), \p
- * E_RB_KEY_NOT_FOUND.
+ * \return Standard.
  *
  * \sa osl_storage_flags
  */
-int osl_get_row(const struct osl_table *t, unsigned col_num,
+__export int osl_get_row(const struct osl_table *t, unsigned col_num,
 		const struct osl_object *obj, struct osl_row **result)
 {
 	int ret;
@@ -1799,13 +1791,12 @@ static int rbtree_loop_reverse(struct osl_column *col,  void *private_data,
  * value, or if all nodes of the tree have been visited.
  *
  *
- * \return Positive on success, negative on errors. If the termination of the
- * loop was caused by \a func returning a negative value, this value is
- * returned.
+ * \return Standard. If the termination of the loop was caused by \a func
+ * returning a negative value, this value is returned.
  *
  * \sa osl_storage_flags, osl_rbtree_loop_reverse(), osl_compare_func.
  */
-int osl_rbtree_loop(const struct osl_table *t, unsigned col_num,
+__export int osl_rbtree_loop(const struct osl_table *t, unsigned col_num,
 	void *private_data, osl_rbtree_loop_func *func)
 {
 	struct osl_column *col;
@@ -1831,7 +1822,7 @@ int osl_rbtree_loop(const struct osl_table *t, unsigned col_num,
  *
  * \sa osl_rbtree_loop().
  */
-int osl_rbtree_loop_reverse(const struct osl_table *t, unsigned col_num,
+__export int osl_rbtree_loop_reverse(const struct osl_table *t, unsigned col_num,
 	void *private_data, osl_rbtree_loop_func *func)
 {
 	struct osl_column *col;
@@ -1904,7 +1895,7 @@ out:
  *
  * \return Standard
  */
-int osl_update_object(struct osl_table *t, const struct osl_row *r,
+__export int osl_update_object(struct osl_table *t, const struct osl_row *r,
 		unsigned col_num, struct osl_object *obj)
 {
 	struct osl_column *col;
@@ -1912,17 +1903,17 @@ int osl_update_object(struct osl_table *t, const struct osl_row *r,
 	int ret;
 
 	if (!t)
-		return -E_BAD_TABLE;
+		return -E_OSL_BAD_TABLE;
 	col = &t->columns[col_num];
 	cd = get_column_description(t->desc, col_num);
 	DEBUG_LOG("updating column %u of %s\n", col_num, t->desc->name);
 	if (cd->storage_flags & OSL_RBTREE) {
 		if (search_rbtree(obj, t, col_num, NULL, NULL) > 0)
-			return -E_RB_KEY_EXISTS;
+			return -E_OSL_RB_KEY_EXISTS;
 	}
 	if (cd->storage_flags & OSL_FIXED_SIZE) {
 		if (obj->size != cd->data_size)
-			return -E_BAD_DATA_SIZE;
+			return -E_OSL_BAD_DATA_SIZE;
 	}
 	remove_rb_node(t, col_num, r);
 	if (cd->storage_type == OSL_NO_STORAGE) { /* TODO: If fixed size, reuse object? */
@@ -2000,12 +1991,11 @@ int osl_update_object(struct osl_table *t, const struct osl_row *r,
  * retrieve one of its containing objects. Afterwards, osl_close_disk_object()
  * must be called in order to deallocate the resources.
  *
- * \return Positive on success, negative on errors. Possible errors include:
- * \p E_BAD_TABLE, \p E_BAD_STORAGE_TYPE, errors returned by osl_get_object().
+ * \return Standard.
  *
  * \sa osl_get_object(), osl_storage_type, osl_close_disk_object().
  */
-int osl_open_disk_object(const struct osl_table *t, const struct osl_row *r,
+__export int osl_open_disk_object(const struct osl_table *t, const struct osl_row *r,
 		unsigned col_num, struct osl_object *obj)
 {
 	const struct osl_column_description *cd;
@@ -2013,10 +2003,10 @@ int osl_open_disk_object(const struct osl_table *t, const struct osl_row *r,
 	int ret;
 
 	if (!t)
-		return -E_BAD_TABLE;
+		return -E_OSL_BAD_TABLE;
 	cd = get_column_description(t->desc, col_num);
 	if (cd->storage_type != OSL_DISK_STORAGE)
-		return -E_BAD_STORAGE_TYPE;
+		return -E_OSL_BAD_STORAGE_TYPE;
 
 	ret = disk_storage_name_of_row(t, r, &ds_name);
 	if (ret < 0)
@@ -2040,7 +2030,7 @@ int osl_open_disk_object(const struct osl_table *t, const struct osl_row *r,
  *
  * \sa para_munmap().
  */
-int osl_close_disk_object(struct osl_object *obj)
+__export int osl_close_disk_object(struct osl_object *obj)
 {
 	return para_munmap(obj->data, obj->size);
 }
@@ -2053,12 +2043,12 @@ int osl_close_disk_object(struct osl_object *obj)
  *
  * The number of rows returned via \a num_rows excluding any invalid rows.
  *
- * \return Positive on success, \p -E_BAD_TABLE if \a t is \p NULL.
+ * \return Positive on success, \p -E_OSL_BAD_TABLE if \a t is \p NULL.
  */
-int osl_get_num_rows(const struct osl_table *t, unsigned *num_rows)
+__export int osl_get_num_rows(const struct osl_table *t, unsigned *num_rows)
 {
 	if (!t)
-		return -E_BAD_TABLE;
+		return -E_OSL_BAD_TABLE;
 	assert(t->num_rows >= t->num_invalid_rows);
 	*num_rows = t->num_rows - t->num_invalid_rows;
 	return 1;
@@ -2076,11 +2066,11 @@ int osl_get_num_rows(const struct osl_table *t, unsigned *num_rows)
  * determined by an in-order tree walk of the rbtree associated with column
  * number \a col_num of \a table.
  *
- * \return Positive on success, negative on errors.
+ * \return Standard.
  *
  * \sa osl_get_nth_row().
  */
-int osl_get_rank(const struct osl_table *t, struct osl_row *r,
+__export int osl_get_rank(const struct osl_table *t, struct osl_row *r,
 		unsigned col_num, unsigned *rank)
 {
 	struct osl_object obj;
@@ -2098,7 +2088,7 @@ int osl_get_rank(const struct osl_table *t, struct osl_row *r,
 		return ret;
 	ret = rb_rank(node, rank);
 	if (ret < 0)
-		return -E_BAD_ROW;
+		return -E_OSL_BAD_ROW;
 	return 1;
 }
 
@@ -2116,13 +2106,12 @@ int osl_get_rank(const struct osl_table *t, struct osl_row *r,
  * \a col_num is not a rbtree column, or if \a n is larger than the
  * number of rows in the table.
  *
- * \return Positive on success, negative on errors. Possible errors:
- * \p E_BAD_TABLE, \p E_BAD_STORAGE_FLAGS, \p E_RB_KEY_NOT_FOUND.
+ * \return Standard.
  *
  * \sa osl_storage_flags, osl_compare_func, osl_get_row(),
  * osl_rbtree_last_row(), osl_rbtree_first_row(), osl_get_rank().
  */
-int osl_get_nth_row(const struct osl_table *t, unsigned col_num,
+__export int osl_get_nth_row(const struct osl_table *t, unsigned col_num,
 		unsigned n, struct osl_row **result)
 {
 	struct osl_column *col;
@@ -2131,18 +2120,18 @@ int osl_get_nth_row(const struct osl_table *t, unsigned col_num,
 	int ret;
 
 	if (n == 0)
-		return -E_RB_KEY_NOT_FOUND;
+		return -E_OSL_RB_KEY_NOT_FOUND;
 	ret = osl_get_num_rows(t, &num_rows);
 	if (ret < 0)
 		return ret;
 	if (n > num_rows)
-		return -E_RB_KEY_NOT_FOUND;
+		return -E_OSL_RB_KEY_NOT_FOUND;
 	ret = check_rbtree_col(t, col_num, &col);
 	if (ret < 0)
 		return ret;
 	node = rb_nth(col->rbtree.rb_node, n);
 	if (!node)
-		return -E_RB_KEY_NOT_FOUND;
+		return -E_OSL_RB_KEY_NOT_FOUND;
 	*result = get_row_pointer(node, col->rbtree_num);
 	return 1;
 }
@@ -2159,11 +2148,11 @@ int osl_get_nth_row(const struct osl_table *t, unsigned col_num,
  * returned. It is an error if \a col_num refers to a column without an
  * associated rbtree.
  *
- * \return Positive on success, negative on errors.
+ * \return Standard.
  *
  * \sa osl_get_nth_row(), osl_rbtree_last_row().
  */
-int osl_rbtree_first_row(const struct osl_table *t, unsigned col_num,
+__export int osl_rbtree_first_row(const struct osl_table *t, unsigned col_num,
 		struct osl_row **result)
 {
 	return osl_get_nth_row(t, col_num, 1, result);
@@ -2180,11 +2169,11 @@ int osl_rbtree_first_row(const struct osl_table *t, unsigned col_num,
  * is that the row containing the greatest rather than the smallest object is
  * returned.
  *
- * \return Positive on success, negative on errors.
+ * \return Standard.
  *
  * \sa osl_get_nth_row(), osl_rbtree_first_row().
  */
-int osl_rbtree_last_row(const struct osl_table *t, unsigned col_num,
+__export int osl_rbtree_last_row(const struct osl_table *t, unsigned col_num,
 		struct osl_row **result)
 {
 	unsigned num_rows;