utils llist: Fixed a segfault in functions doing lookups.

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

diff --git a/src/utils/llist.c b/src/utils/llist.c
index dfc8fb99d18ecfeb6e38cc0a7339426854691704..0af9c8cb11bec4346b96c557275b4a813ccfd618 100644 (file)
--- 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)
 {
@@ -292,19 +306,15 @@ sdb_llist_insert_sorted(sdb_llist_t *list,
 
 sdb_object_t *
 sdb_llist_search(sdb_llist_t *list,
-               const sdb_object_t *key, sdb_llist_cmp_cb compare)
+               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)
 {