Merge commit 'meins/master'

diff --combined osl.c
index c92412fbce765444c7a0d713cdeeffca35d824c1,9bdc351dcbfa6f4f8fd47fe65b1a6d8016e9ba21..16b3af5ecee2ed3cfa2abacc2cd1756cc2646e7a
--- 1/osl.c
--- 2/osl.c
+++ b/osl.c
@@@ -148,11 -148,6 +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,10 -766,6 +766,10 @@@ int get_mapped_object(const struct osl_
        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 --combined osl.h.in
index c703914933901264692f59a9d2eab00a92b3860b,5d81459a380772fd63764dcae930119a1c938258..525587721e837a0b8df67062d4973844cf2ed420
--- 1/osl.h.in
--- 2/osl.h.in
+++ b/osl.h.in
@@@ -7,7 -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)
@@@ -172,7 -171,7 +172,7 @@@ int osl_create_table(const struct osl_t
   *
   * 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
@@@ -221,7 -220,7 +221,7 @@@ int osl_get_row(const struct osl_table 
   * 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.
   *
@@@ -477,19 -476,6 +477,6 @@@ int osl_get_nth_row(const struct osl_ta
  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.
   *