X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Futils%2Fllist.c;h=0a4665d09296c2387bcf1f369f81f5e751c20fa4;hb=4215d1d8c69367c1d43bed9d39d428a92b329a92;hp=e853001bc45bf7fd9a02f55961930105f89366cf;hpb=bef7167f0dc1fd405e35d5cbffb3c0820945a9ea;p=sysdb.git

diff --git a/src/utils/llist.c b/src/utils/llist.c
index e853001..0a4665d 100644
--- a/src/utils/llist.c
+++ b/src/utils/llist.c
@@ -29,6 +29,7 @@
 
 #include <assert.h>
 #include <stdlib.h>
+#include <strings.h>
 
 #include <pthread.h>
 
@@ -114,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)
 {
@@ -167,28 +182,28 @@ sdb_llist_create(void)
 sdb_llist_t *
 sdb_llist_clone(sdb_llist_t *list)
 {
-	sdb_llist_t *clone;
+	sdb_llist_t *new;
 	sdb_llist_elem_t *elem;
 
 	if (! list)
 		return NULL;
 
-	clone = sdb_llist_create();
-	if (! clone)
+	new = sdb_llist_create();
+	if (! new)
 		return NULL;
 
 	if (! list->length) {
 		assert((! list->head) && (! list->tail));
-		return clone;
+		return new;
 	}
 
 	for (elem = list->head; elem; elem = elem->next) {
-		if (sdb_llist_append(clone, elem->obj)) {
-			sdb_llist_destroy(clone);
+		if (sdb_llist_append(new, elem->obj)) {
+			sdb_llist_destroy(new);
 			return NULL;
 		}
 	}
-	return clone;
+	return new;
 } /* sdb_llist_clone */
 
 void
@@ -234,7 +249,7 @@ sdb_llist_append(sdb_llist_t *list, sdb_object_t *obj)
 } /* sdb_llist_append */
 
 int
-sdb_llist_insert(sdb_llist_t *list, sdb_object_t *obj, size_t index)
+sdb_llist_insert(sdb_llist_t *list, sdb_object_t *obj, size_t idx)
 {
 	sdb_llist_elem_t *prev;
 	sdb_llist_elem_t *next;
@@ -243,7 +258,7 @@ sdb_llist_insert(sdb_llist_t *list, sdb_object_t *obj, size_t index)
 
 	size_t i;
 
-	if ((! list) || (! obj) || (index > list->length))
+	if ((! list) || (! obj) || (idx > list->length))
 		return -1;
 
 	pthread_rwlock_wrlock(&list->lock);
@@ -251,7 +266,7 @@ sdb_llist_insert(sdb_llist_t *list, sdb_object_t *obj, size_t index)
 	prev = NULL;
 	next = list->head;
 
-	for (i = 0; i < index; ++i) {
+	for (i = 0; i < idx; ++i) {
 		prev = next;
 		next = next->next;
 	}
@@ -261,8 +276,8 @@ sdb_llist_insert(sdb_llist_t *list, sdb_object_t *obj, size_t index)
 } /* 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;
@@ -290,18 +305,35 @@ 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) || (! lookup))
+		return NULL;
+
+	pthread_rwlock_rdlock(&list->lock);
+	elem = llist_search(list, lookup, user_data);
+	pthread_rwlock_unlock(&list->lock);
+
+	if (elem)
+		return elem->obj;
+	return NULL;
+} /* sdb_llist_search */
+
+sdb_object_t *
+sdb_llist_search_by_name(sdb_llist_t *list, const char *key)
 {
 	sdb_llist_elem_t *elem;
 
-	if ((! list) || (! compare))
+	if (! list)
 		return NULL;
 
 	pthread_rwlock_rdlock(&list->lock);
 
 	for (elem = list->head; elem; elem = elem->next)
-		if (! compare(elem->obj, key))
+		if (! strcasecmp(elem->obj->name, key))
 			break;
 
 	pthread_rwlock_unlock(&list->lock);
@@ -309,7 +341,26 @@ sdb_llist_search(sdb_llist_t *list, const sdb_object_t *key,
 	if (elem)
 		return elem->obj;
 	return NULL;
-} /* sdb_llist_search */
+} /* 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)
@@ -383,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 : */