X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=osl.h.in;h=d5a7d1d92330e02f9f2114a15eb48fdd57c04570;hp=da70cfd5bbf80761ccf070633be6fe2a7fea0eb3;hb=bc025530248c52e31a629b2a8943b2f68e919caa;hpb=63bb48e9e1b1d137e5b19ac7ee772e314782c177 diff --git a/osl.h.in b/osl.h.in index da70cfd..d5a7d1d 100644 --- a/osl.h.in +++ b/osl.h.in @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Andre Noll + * Copyright (C) 2007-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -7,6 +7,7 @@ /** \file osl.h User interface for the object storage layer. */ #include +#include /** Export all declarations in this file. */ #pragma GCC visibility push(default) @@ -77,7 +78,7 @@ struct osl_row; * specified. Such a function always takes pointers to the two objects to be * compared. It must return -1, zero, or 1, if the first argument is considered * to be respectively less than, equal to, or greater than the second. If two - * members compare as equal, their order in the sorted array is undefined. + * members compare as equal, their order in the rbtree is undefined. */ typedef int osl_compare_func(const struct osl_object *obj1, const struct osl_object *obj2); @@ -444,8 +445,8 @@ int osl_rbtree_last_row(const struct osl_table *t, unsigned col_num, * \param result Row is returned here. * * Retrieve the n-th order statistic with respect to the compare function - * of the rbtree column \a col_num. In other words, get that row with - * \a n th greatest value in column \a col_num. It's an error if + * of the rbtree column \a col_num. In other words, get the row with + * \a n th greatest value in column \a col_num. It is an error if * \a col_num is not a rbtree column, or if \a n is larger than the * number of rows in the table. * @@ -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. *