Merged branch 'master' of git://git.tokkee.org/sysdb.

[sysdb.git] / src / include / utils / llist.h

diff --git a/src/include/utils/llist.h b/src/include/utils/llist.h
index c37c2719af46803b08aedf45c08a61148fe5e6b0..2742139f17db051d12b36c279889ff0c0bbfb48f 100644 (file)
--- a/src/include/utils/llist.h
+++ b/src/include/utils/llist.h
@@ -40,6 +40,9 @@ typedef struct sdb_llist sdb_llist_t;
 struct sdb_llist_iter;
 typedef struct sdb_llist_iter sdb_llist_iter_t;
 
+typedef int (*sdb_llist_cmp_cb)(const sdb_object_t *, const sdb_object_t *);
+typedef int (*sdb_llist_lookup_cb)(const sdb_object_t *, const void *user_data);
+
 /*
  * sdb_llist_create, sdb_llist_destroy:
  * Create and destroy a doubly linked list object.
@@ -113,22 +116,22 @@ sdb_llist_insert(sdb_llist_t *list, sdb_object_t *obj, size_t idx);
  *  - a negative value on failure
  */
 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);
 
 /*
  * sdb_llist_search:
- * Search for a 'key' in the given 'list'. The function will return the first
- * entry that matches the specified 'key'. For that purpose, the 'compare'
- * function is used. It should return 0 iff the two arguments compare equal.
+ * Search for a object in the given 'list'. The function will return the first
+ * entry for which the 'lookup' callback returns 0. The 'user_data' is passed
+ * on to the lookup function on each invocation.
  *
  * Returns:
  *  - a pointer to the first matching object
  *  - NULL else
  */
 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_search_by_name:
@@ -143,6 +146,20 @@ sdb_llist_search(sdb_llist_t *list, const sdb_object_t *key,
 sdb_object_t *
 sdb_llist_search_by_name(sdb_llist_t *list, const char *key);
 
+/*
+ * sdb_llist_remove:
+ * Removes and returns the first matchin element of the list. The ref-count of
+ * the item will not be changed, that is, if the element will not be used any
+ * further, it should be de-referenced by the caller.
+ *
+ * Returns:
+ *  - a pointer to the first matching object
+ *  - NULL else
+ */
+sdb_object_t *
+sdb_llist_remove(sdb_llist_t *list,
+               sdb_llist_lookup_cb lookup, const void *user_data);
+
 /*
  * sdb_llist_shift:
  * Removes and returns the first element of the list. The ref-count of the
@@ -156,7 +173,8 @@ sdb_llist_search_by_name(sdb_llist_t *list, const char *key);
 sdb_object_t *
 sdb_llist_shift(sdb_llist_t *list);
 
-/* sdb_llist_get_iter, sdb_llist_iter_has_next, sdb_llist_iter_get_next:
+/*
+ * sdb_llist_get_iter, sdb_llist_iter_has_next, sdb_llist_iter_get_next:
  * Iterate through the list, element by element.
  *
  * sdb_llist_iter_get_next returns NULL if there is no next element.
@@ -171,6 +189,20 @@ sdb_llist_iter_has_next(sdb_llist_iter_t *iter);
 sdb_object_t *
 sdb_llist_iter_get_next(sdb_llist_iter_t *iter);
 
+/*
+ * sdb_llist_iter_remove_current:
+ * Remove the current object from the list, that is, the object which was
+ * returned by the last call to sdb_llist_iter_get_next().
+ *
+ * This operation is not safe if another iterator is in use at the same time.
+ *
+ * Returns:
+ *  - 0 on success
+ *  - a negative value else
+ */
+int
+sdb_llist_iter_remove_current(sdb_llist_iter_t *iter);
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif