From: Andre Noll <maan@systemlinux.org>
Date: Thu, 16 Apr 2009 14:58:43 +0000 (+0200)
Subject: Merge commit 'fml/master'
X-Git-Tag: v0.1.0~38^2
X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=commitdiff_plain;h=b1f8454f81b73194e0e731bb1c9f520ca79ecec4;hp=62d0e2422234f6e47f2f9202f0e31a1db184580a

Merge commit 'fml/master'
---

diff --git a/osl.c b/osl.c
index 9e6de44..16b3af5 100644
--- a/osl.c
+++ b/osl.c
@@ -148,11 +148,6 @@ static int verify_name(const char *name)
 	return 1;
 }
 
-int osl_hash_compare(const struct osl_object *obj1, const struct osl_object *obj2)
-{
-	return hash_compare((HASH_TYPE *)obj1->data, (HASH_TYPE *)obj2->data);
-}
-
 static char *disk_storage_dirname(const struct osl_table *t, unsigned col_num,
 		const char *ds_name)
 {
@@ -771,6 +766,10 @@ int get_mapped_object(const struct osl_table *t, unsigned col_num,
 	return 1;
 }
 
+/*
+ * It's OK to call this with result = rb_node = NULL.  If result is not NULL,
+ * and rb key was not found, result points to the parent node.
+ */
 static int search_rbtree(const struct osl_object *obj,
 		const struct osl_table *t, unsigned col_num,
 		struct rb_node **result, struct rb_node ***rb_link)
diff --git a/osl.h.in b/osl.h.in
index 67d705a..5255877 100644
--- a/osl.h.in
+++ b/osl.h.in
@@ -7,6 +7,7 @@
 /** \file osl.h User interface for the object storage layer. */
 
 #include <sys/mman.h>
+#include <inttypes.h>
 
 /** Export all declarations in this file. */
 #pragma GCC visibility push(default)
@@ -171,7 +172,7 @@ int osl_create_table(const struct osl_table_description *desc);
  *
  * Each osl table must be opened before its data can be accessed.
  *
- * \param table_desc Describes the table to be opened.
+ * \param desc Describes the table to be opened.
  * \param result Contains a pointer to the open table on success.
  *
  * The table description given by \a desc should coincide with the
@@ -220,7 +221,7 @@ int osl_get_row(const struct osl_table *t, unsigned col_num,
  * Retrieve an object identified by row and column
  *
  * \param t Pointer to an open osl table.
- * \param r Pointer to the row.
+ * \param row Pointer to the row.
  * \param col_num The column number.
  * \param object The result pointer.
  *
@@ -476,19 +477,6 @@ int osl_get_nth_row(const struct osl_table *t, unsigned col_num,
 int osl_get_rank(const struct osl_table *t, struct osl_row *r,
 	unsigned col_num, unsigned *rank);
 
-/**
- * Compare two osl objects pointing to hash values.
- *
- * \param obj1 Pointer to the first hash object.
- * \param obj2 Pointer to the second hash object.
- *
- * \return The values required for an osl compare function.
- *
- * \sa osl_compare_func, uint32_compare().
- */
-int osl_hash_compare(const struct osl_object *obj1,
-		const struct osl_object *obj2);
-
 /**
  * Get a string describing the error code passed in the argument.
  *