X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Futils%2Fllist.c;h=0a4665d09296c2387bcf1f369f81f5e751c20fa4;hb=3a48bac5a41bff96412b1ac8f15bdc97cb9e28be;hp=b606324e56f96b5510a48f10f7a27d4a30db57a0;hpb=1fee763a36a0c9af761244bbce8cd6c233ddbe2a;p=sysdb.git

diff --git a/src/utils/llist.c b/src/utils/llist.c
index b606324..0a4665d 100644
--- a/src/utils/llist.c
+++ b/src/utils/llist.c
@@ -115,6 +115,20 @@ sdb_llist_insert_after(sdb_llist_t *list, sdb_llist_elem_t *elem,
 	return 0;
 } /* sdb_llist_insert_after */
 
+static sdb_llist_elem_t *
+llist_search(sdb_llist_t *list,
+		sdb_llist_lookup_cb lookup, const void *user_data)
+{
+	sdb_llist_elem_t *elem;
+
+	assert(list && lookup);
+
+	for (elem = list->head; elem; elem = elem->next)
+		if (! lookup(elem->obj, user_data))
+			break;
+	return elem;
+} /* llist_search */
+
 static sdb_object_t *
 sdb_llist_remove_elem(sdb_llist_t *list, sdb_llist_elem_t *elem)
 {
@@ -262,8 +276,8 @@ sdb_llist_insert(sdb_llist_t *list, sdb_object_t *obj, size_t idx)
 } /* sdb_llist_insert */
 
 int
-sdb_llist_insert_sorted(sdb_llist_t *list, sdb_object_t *obj,
-		int (*compare)(const sdb_object_t *, const sdb_object_t *))
+sdb_llist_insert_sorted(sdb_llist_t *list,
+		sdb_object_t *obj, sdb_llist_cmp_cb compare)
 {
 	sdb_llist_elem_t *prev;
 	sdb_llist_elem_t *next;
@@ -291,20 +305,16 @@ sdb_llist_insert_sorted(sdb_llist_t *list, sdb_object_t *obj,
 } /* sdb_llist_insert_sorted */
 
 sdb_object_t *
-sdb_llist_search(sdb_llist_t *list, const sdb_object_t *key,
-		int (*compare)(const sdb_object_t *, const sdb_object_t *))
+sdb_llist_search(sdb_llist_t *list,
+		sdb_llist_lookup_cb lookup, const void *user_data)
 {
 	sdb_llist_elem_t *elem;
 
-	if ((! list) || (! compare))
+	if ((! list) || (! lookup))
 		return NULL;
 
 	pthread_rwlock_rdlock(&list->lock);
-
-	for (elem = list->head; elem; elem = elem->next)
-		if (! compare(elem->obj, key))
-			break;
-
+	elem = llist_search(list, lookup, user_data);
 	pthread_rwlock_unlock(&list->lock);
 
 	if (elem)
@@ -333,6 +343,25 @@ sdb_llist_search_by_name(sdb_llist_t *list, const char *key)
 	return NULL;
 } /* sdb_llist_search_by_name */
 
+sdb_object_t *
+sdb_llist_remove(sdb_llist_t *list,
+		sdb_llist_lookup_cb lookup, const void *user_data)
+{
+	sdb_llist_elem_t *elem;
+	sdb_object_t *obj = NULL;
+
+	if ((! list) || (! lookup))
+		return NULL;
+
+	pthread_rwlock_wrlock(&list->lock);
+	elem = llist_search(list, lookup, user_data);
+	if (elem)
+		obj = sdb_llist_remove_elem(list, elem);
+	pthread_rwlock_unlock(&list->lock);
+
+	return obj;
+} /* sdb_llist_remove */
+
 sdb_object_t *
 sdb_llist_shift(sdb_llist_t *list)
 {
@@ -405,5 +434,29 @@ sdb_llist_iter_get_next(sdb_llist_iter_t *iter)
 	return obj;
 } /* sdb_llist_iter_get_next */
 
+int
+sdb_llist_iter_remove_current(sdb_llist_iter_t *iter)
+{
+	sdb_llist_elem_t *elem;
+
+	if ((! iter) || (! iter->list))
+		return -1;
+
+	pthread_rwlock_wrlock(&iter->list->lock);
+
+	if (! iter->elem) /* reached end of list */
+		elem = iter->list->tail;
+	else
+		elem = iter->elem->prev;
+	if (elem)
+		sdb_llist_remove_elem(iter->list, elem);
+
+	pthread_rwlock_unlock(&iter->list->lock);
+
+	if (! elem)
+		return -1;
+	return 0;
+} /* sdb_llist_iter_remove */
+
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */