/*
- * Copyright (C) 2007-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2009 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
#include "rbtree.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 {
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);
*/
enum index_header_offsets {
/** Bytes 0-8: PARASLASH. */
- IDX_PARA_MAGIC = 0,
+ IDX_OSL_MAGIC = 0,
/** Byte 9: Dirty flag (nonzero if table is mapped). */
IDX_DIRTY_FLAG = 9,
/** Byte 10: osl table version number. */
};
/** Magic string contained in the header of the index file of each osl table. */
-#define PARA_MAGIC "PARASLASH"
+#define OSL_MAGIC "PARASLASH"
/**
* The minimal number of bytes for a column in the index header.
_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);
}
/**
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.
*