proto utils: Added sdb_proto_select().

[sysdb.git] / src / utils / llist.c

diff --git a/src/utils/llist.c b/src/utils/llist.c
index 0d61769b26b8daea103c73e6bb3d8d31e1886be3..0a4665d09296c2387bcf1f369f81f5e751c20fa4 100644 (file)
--- a/src/utils/llist.c
+++ b/src/utils/llist.c
@@ -121,8 +121,7 @@ llist_search(sdb_llist_t *list,
 {
        sdb_llist_elem_t *elem;
 
-       if ((! list) || (! lookup))
-               return NULL;
+       assert(list && lookup);
 
        for (elem = list->head; elem; elem = elem->next)
                if (! lookup(elem->obj, user_data))
@@ -311,6 +310,9 @@ sdb_llist_search(sdb_llist_t *list,
 {
        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);
@@ -348,6 +350,9 @@ sdb_llist_remove(sdb_llist_t *list,
        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)
@@ -429,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 : */