X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=osl_core.h;h=a23bb3d9d0652dbc8811032240a14fba7db05ce4;hp=16a6775be607ae36a344bea9162c075e9fe90054;hb=c73d23911d78ed10179c12ef8f79a3fcf3bbcdaf;hpb=a3b43ea4ccc39b56ec4de003f83836b75905afe2

diff --git a/osl_core.h b/osl_core.h
index 16a6775b..a23bb3d9 100644
--- a/osl_core.h
+++ b/osl_core.h
@@ -67,8 +67,12 @@ struct osl_table {
 
 /** Internal representation of a row of an osl table */
 struct osl_row {
-	/** The row number only present if there is at least one mapped column. */
-	off_t id;
+	/**
+	 * The row number.
+	 *
+	 * It is only used if there is at least one mapped column.
+	 */
+	off_t num;
 	/** Array of size \a num_volatile_columns. */
 	struct osl_object *volatile_objects;
 };
@@ -76,9 +80,9 @@ struct osl_row {
 int read_table_desc(struct osl_object *map, struct osl_table_description *desc);
 int init_table_structure(const struct osl_table_description *desc,
 		struct osl_table **table_ptr);
-int row_is_invalid(struct osl_table *t, uint32_t id);
+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 id, struct osl_object *obj);
+	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);
@@ -472,14 +476,14 @@ static inline char *disk_storage_name_of_hash(const struct osl_table *t, HASH_TY
  * \param old_path The source path.
  * \param new_path The destination path.
  *
- * \return positive in success, \p -E_RENAME on errors.
+ * \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 -E_RENAME;
+		return -ERRNO_TO_PARA_ERROR(errno);
 	return 1;
 }