Merge commit 'meins/master'

[osl.git] / osl.c

diff --git a/osl.c b/osl.c
index 9e6de44f9b6192a465b172567737524dbef76f67..16b3af5ecee2ed3cfa2abacc2cd1756cc2646e7a 100644 (file)
--- 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)