diff --git a/src/utils/llist.c b/src/utils/llist.c
index b606324e56f96b5510a48f10f7a27d4a30db57a0..0a4665d09296c2387bcf1f369f81f5e751c20fa4 100644 (file)
--- a/src/utils/llist.c
+++ b/src/utils/llist.c
return 0;
} /* sdb_llist_insert_after */
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)
{
static sdb_object_t *
sdb_llist_remove_elem(sdb_llist_t *list, sdb_llist_elem_t *elem)
{
} /* sdb_llist_insert */
int
} /* 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;
{
sdb_llist_elem_t *prev;
sdb_llist_elem_t *next;
} /* sdb_llist_insert_sorted */
sdb_object_t *
} /* 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;
{
sdb_llist_elem_t *elem;
- if ((! list) || (! compare))
+ if ((! list) || (! lookup))
return NULL;
pthread_rwlock_rdlock(&list->lock);
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)
pthread_rwlock_unlock(&list->lock);
if (elem)
return NULL;
} /* sdb_llist_search_by_name */
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)
{
sdb_object_t *
sdb_llist_shift(sdb_llist_t *list)
{
return obj;
} /* sdb_llist_iter_get_next */
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 : */
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */