X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=osl_core.h;h=df32b60a875b4c4448f991823ab1e974d5a4f0c7;hp=b6d1f8222878de726dfadeced976fc1f9c99799f;hb=cf207dcadaa03addb1381012f9b822a754a526af;hpb=02e6053e5976c6aa4bf538f3469335835d54e478

diff --git a/osl_core.h b/osl_core.h
index b6d1f82..df32b60 100644
--- a/osl_core.h
+++ b/osl_core.h
@@ -7,10 +7,9 @@
 /** \file osl_core.h Object storage layer details, not visible to users. */
 
 #include "rbtree.h"
-#include "osl.h"
 #include "hash.h"
 
-static __must_check __printf_1_2 __malloc char *make_message(const char *fmt, ...);
+__must_check __printf_1_2 __malloc char *make_message(const char *fmt, ...);
 
 /** Internal representation of a column of an osl table. */
 struct osl_column {
@@ -84,7 +83,6 @@ int init_table_structure(const struct osl_table_description *desc,
 int row_is_invalid(struct osl_table *t, uint32_t row_num);
 int get_mapped_object(const struct osl_table *t, unsigned col_num,
 	uint32_t row_num, struct osl_object *obj);
-int para_truncate(const char *filename, off_t size);
 int unmap_table(struct osl_table *t, enum osl_close_flags flags);
 int init_rbtrees(struct osl_table *t);
 
@@ -261,7 +259,7 @@ _static_inline_ int get_row_index(const struct osl_table *t, uint32_t row_num,
 	index_offset = t->index_header_size + t->row_index_size * row_num;
 	if (index_offset + 8 > t->index_map.size) {
 		*row_index = NULL;
-		return -E_INDEX_CORRUPTION;
+		return -E_OSL_INDEX_CORRUPTION;
 	}
 	*row_index = (char *)(t->index_map.data) + index_offset;
 	return 1;
@@ -305,8 +303,8 @@ _static_inline_ int get_cell_index(const struct osl_table *t, uint32_t row_num,
 _static_inline_ void update_cell_index(char *row_index, struct osl_column *col,
 		uint32_t map_size, uint32_t object_size)
 {
-	write_u32(row_index + col->index_offset, map_size - object_size - 1);
-	write_u32(row_index + col->index_offset + 4, object_size + 1);
+	write_u32(row_index + col->index_offset, map_size - object_size);
+	write_u32(row_index + col->index_offset + 4, object_size);
 }
 
 /**
@@ -474,23 +472,6 @@ _static_inline_ char *disk_storage_name_of_hash(const struct osl_table *t, HASH_
 	return strdup(asc);
 }
 
-/**
- * A wrapper for rename(2).
- *
- * \param old_path The source path.
- * \param new_path The destination path.
- *
- * \return Standard.
- *
- * \sa rename(2).
- */
-_static_inline_ int para_rename(const char *old_path, const char *new_path)
-{
-	if (rename(old_path, new_path) < 0)
-		return -ERRNO_TO_ERROR(errno);
-	return 1;
-}
-
 /**
  * Iterate over each column of an initialized table.
  *