X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=osl_core.h;h=5e2acaa0dc6fcc2074b9686724020be56d6f822f;hp=599d22da6146c8cb88c5330a1a347c4b3b88c756;hb=6442f07bb08eb6e557086587f997b1785ea18ef7;hpb=b169ef85673c208ff283217e4cde2f5816e69518;ds=sidebyside

diff --git a/osl_core.h b/osl_core.h
index 599d22da..5e2acaa0 100644
--- a/osl_core.h
+++ b/osl_core.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -9,6 +9,7 @@
 #include "rbtree.h"
 #include "osl.h"
 #include "string.h"
+#include "portable_io.h"
 #include "hash.h"
 
 /** Internal representation of a column of an osl table. */
@@ -56,7 +57,7 @@ struct osl_table {
 	unsigned num_rbtrees;
 	/**
 	 * The number of the column that determines the name of the disk
-	 * storage objcts.
+	 * storage objects.
 	 */
 	unsigned disk_storage_name_column;
 	/** The number of bytes of an index entry of a row. */
@@ -95,7 +96,7 @@ int init_rbtrees(struct osl_table *t);
 enum map_table_flags {
 	/**
 	 * Check whether the entries in the table index match the entries in
-	 * the table desctiption.
+	 * the table description.
  	 */
 	MAP_TBL_FL_VERIFY_INDEX = 1,
 	/** Do not complain even if the dirty flag is set. */
@@ -113,7 +114,7 @@ int mark_row_invalid(struct osl_table *t, uint32_t row_num);
  * Get the description of a column by column number
  *
  * \param d Pointer to the table description.
- * \param col_num The number of the column to get the desctiption for.
+ * \param col_num The number of the column to get the description for.
  *
  * \return The table description.
  *
@@ -439,9 +440,9 @@ _static_inline_ struct osl_row *get_row_pointer(const struct rb_node *node,
  * \param obj the Object to compute the hash value from.
  * \param hash Result is returned here.
  */
-static inline void hash_object(const struct osl_object *obj, HASH_TYPE *hash)
+_static_inline_ void hash_object(const struct osl_object *obj, HASH_TYPE *hash)
 {
-	return hash_function(obj->data, obj->size, hash);
+	hash_function(obj->data, obj->size, hash);
 }
 
 /**
@@ -460,7 +461,7 @@ static inline void hash_object(const struct osl_object *obj, HASH_TYPE *hash)
  *
  * \sa struct osl_table:disk_storage_name_column.
  */
-static inline char *disk_storage_name_of_hash(const struct osl_table *t, HASH_TYPE *hash)
+_static_inline_ char *disk_storage_name_of_hash(const struct osl_table *t, HASH_TYPE *hash)
 {
 	char asc[2 * HASH_SIZE + 2];
 
@@ -476,14 +477,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)
+_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;
 }