/*
- * 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.
*/
#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. */
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. */
/** 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;
};
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);
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. */
* 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.
*
* \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);
}
/**
*
* \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];
* \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;
}