X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=12424c40e0dda04400698c6e14d71e69387ccfd9;hp=995c7552129512c6e2dc6228c165779c9e7979a0;hb=b2e6a24448a9e49e0766ab4f32163580eeff469e;hpb=09b7971c7a862924d4ce669f8a33bda567ba570b;ds=sidebyside

diff --git a/aft.c b/aft.c
index 995c7552..12424c40 100644
--- a/aft.c
+++ b/aft.c
@@ -218,12 +218,27 @@ enum audio_file_table_columns {
 	NUM_AFT_COLUMNS
 };
 
+/**
+ * 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 aft_hash_compare(const struct osl_object *obj1, const struct osl_object *obj2)
+{
+	return hash_compare((HASH_TYPE *)obj1->data, (HASH_TYPE *)obj2->data);
+}
+
 static struct osl_column_description aft_cols[] = {
 	[AFTCOL_HASH] = {
 		.storage_type = OSL_MAPPED_STORAGE,
 		.storage_flags = OSL_RBTREE | OSL_FIXED_SIZE | OSL_UNIQUE,
 		.name = "hash",
-		.compare_function = osl_hash_compare,
+		.compare_function = aft_hash_compare,
 		.data_size = HASH_SIZE
 	},
 	[AFTCOL_PATH] = {
@@ -1682,7 +1697,7 @@ static void com_add_callback(int fd, const struct osl_object *query)
 	PARA_INFO_LOG("request to add %s\n", path);
 	hs = find_hash_sister(hash);
 	ret = aft_get_row_of_path(path, &pb);
-	if (ret < 0 && ret != -E_RB_KEY_NOT_FOUND)
+	if (ret < 0 && ret != -E_OSL_RB_KEY_NOT_FOUND)
 		goto out;
 	if (hs && pb && hs == pb && !(flags & ADD_FLAG_FORCE)) {
 		if (flags & ADD_FLAG_VERBOSE)
@@ -1845,7 +1860,7 @@ static int add_one_audio_file(const char *path, void *private_data)
 	query.size = strlen(path) + 1;
 	ret = send_callback_request(path_brother_callback, &query,
 		get_row_pointer_from_result, &pb);
-	if (ret < 0 && ret != -E_RB_KEY_NOT_FOUND)
+	if (ret < 0 && ret != -E_OSL_RB_KEY_NOT_FOUND)
 		goto out_free;
 	ret = 1;
 	if (pb && (pad->flags & ADD_FLAG_LAZY)) { /* lazy is really cheap */