utils llist: Removed sdb_ prefix from private functions.

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

diff --git a/src/utils/llist.c b/src/utils/llist.c
index 0a4665d09296c2387bcf1f369f81f5e751c20fa4..e042c99df1c81bb3b55482f8a6b8b5470a20d388 100644 (file)
--- a/src/utils/llist.c
+++ b/src/utils/llist.c
@@ -25,6 +25,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_CONFIG_H
+#      include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include "utils/llist.h"
 
 #include <assert.h>
@@ -68,7 +72,7 @@ struct sdb_llist_iter {
 /* Insert a new element after 'elem'. If 'elem' is NULL, insert at the head of
  * the list. */
 static int
-sdb_llist_insert_after(sdb_llist_t *list, sdb_llist_elem_t *elem,
+llist_insert_after(sdb_llist_t *list, sdb_llist_elem_t *elem,
                sdb_object_t *obj)
 {
        sdb_llist_elem_t *new;
@@ -113,7 +117,7 @@ sdb_llist_insert_after(sdb_llist_t *list, sdb_llist_elem_t *elem,
        sdb_object_ref(obj);
        ++list->length;
        return 0;
-} /* sdb_llist_insert_after */
+} /* llist_insert_after */
 
 static sdb_llist_elem_t *
 llist_search(sdb_llist_t *list,
@@ -130,7 +134,7 @@ llist_search(sdb_llist_t *list,
 } /* llist_search */
 
 static sdb_object_t *
-sdb_llist_remove_elem(sdb_llist_t *list, sdb_llist_elem_t *elem)
+llist_remove_elem(sdb_llist_t *list, sdb_llist_elem_t *elem)
 {
        sdb_object_t *obj;
 
@@ -157,7 +161,7 @@ sdb_llist_remove_elem(sdb_llist_t *list, sdb_llist_elem_t *elem)
 
        --list->length;
        return obj;
-} /* sdb_llist_remove_elem */
+} /* llist_remove_elem */
 
 /*
  * public API
@@ -243,7 +247,7 @@ sdb_llist_append(sdb_llist_t *list, sdb_object_t *obj)
                return -1;
 
        pthread_rwlock_wrlock(&list->lock);
-       status = sdb_llist_insert_after(list, list->tail, obj);
+       status = llist_insert_after(list, list->tail, obj);
        pthread_rwlock_unlock(&list->lock);
        return status;
 } /* sdb_llist_append */
@@ -270,7 +274,7 @@ sdb_llist_insert(sdb_llist_t *list, sdb_object_t *obj, size_t idx)
                prev = next;
                next = next->next;
        }
-       status = sdb_llist_insert_after(list, prev, obj);
+       status = llist_insert_after(list, prev, obj);
        pthread_rwlock_unlock(&list->lock);
        return status;
 } /* sdb_llist_insert */
@@ -299,11 +303,28 @@ sdb_llist_insert_sorted(sdb_llist_t *list,
                prev = next;
                next = next->next;
        }
-       status = sdb_llist_insert_after(list, prev, obj);
+       status = llist_insert_after(list, prev, obj);
        pthread_rwlock_unlock(&list->lock);
        return status;
 } /* sdb_llist_insert_sorted */
 
+sdb_object_t *
+sdb_llist_get(sdb_llist_t *list, size_t i)
+{
+       sdb_llist_elem_t *elem;
+       size_t j;
+
+       if ((! list) || (i >= list->length))
+               return NULL;
+
+       for (elem = list->head, j = 0; j < i; elem = elem->next, ++j)
+               /* iterate */;
+
+       assert(elem);
+       sdb_object_ref(elem->obj);
+       return elem->obj;
+} /* sdb_llist_get */
+
 sdb_object_t *
 sdb_llist_search(sdb_llist_t *list,
                sdb_llist_lookup_cb lookup, const void *user_data)
@@ -356,12 +377,35 @@ sdb_llist_remove(sdb_llist_t *list,
        pthread_rwlock_wrlock(&list->lock);
        elem = llist_search(list, lookup, user_data);
        if (elem)
-               obj = sdb_llist_remove_elem(list, elem);
+               obj = llist_remove_elem(list, elem);
        pthread_rwlock_unlock(&list->lock);
 
        return obj;
 } /* sdb_llist_remove */
 
+sdb_object_t *
+sdb_llist_remove_by_name(sdb_llist_t *list, const char *key)
+{
+       sdb_llist_elem_t *elem;
+       sdb_object_t *obj = NULL;
+
+       if (! list)
+               return NULL;
+
+       pthread_rwlock_rdlock(&list->lock);
+
+       for (elem = list->head; elem; elem = elem->next)
+               if ((key == elem->obj->name)
+                               || (! strcasecmp(elem->obj->name, key)))
+                       break;
+
+       if (elem)
+               obj = llist_remove_elem(list, elem);
+       pthread_rwlock_unlock(&list->lock);
+
+       return obj;
+} /* sdb_llist_remove_by_name */
+
 sdb_object_t *
 sdb_llist_shift(sdb_llist_t *list)
 {
@@ -371,7 +415,7 @@ sdb_llist_shift(sdb_llist_t *list)
                return NULL;
 
        pthread_rwlock_wrlock(&list->lock);
-       obj = sdb_llist_remove_elem(list, list->head);
+       obj = llist_remove_elem(list, list->head);
        pthread_rwlock_unlock(&list->lock);
        return obj;
 } /* sdb_llist_shift */
@@ -427,6 +471,11 @@ sdb_llist_iter_get_next(sdb_llist_iter_t *iter)
 
        pthread_rwlock_rdlock(&iter->list->lock);
 
+       /* XXX: increment ref-cnt for this object?
+        *      also: when letting an element take ownership of next and prev
+        *      elements, this might be a fairly cheap way to implement a weak
+        *      type of snapshotting */
+
        obj = iter->elem->obj;
        iter->elem = iter->elem->next;
 
@@ -449,7 +498,7 @@ sdb_llist_iter_remove_current(sdb_llist_iter_t *iter)
        else
                elem = iter->elem->prev;
        if (elem)
-               sdb_llist_remove_elem(iter->list, elem);
+               llist_remove_elem(iter->list, elem);
 
        pthread_rwlock_unlock(&iter->list->lock);
 
@@ -458,5 +507,13 @@ sdb_llist_iter_remove_current(sdb_llist_iter_t *iter)
        return 0;
 } /* sdb_llist_iter_remove */
 
+size_t
+sdb_llist_len(sdb_llist_t *list)
+{
+       if (! list)
+               return 0;
+       return list->length;
+} /* sdb_llist_len */
+
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */