X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Finclude%2Futils%2Fllist.h;h=8d2b96e9ae95cf38a693d1a701397160e5936b1a;hb=49b5a4d2e8e4fb1e4f67c2a368d8d2e3e76b765f;hp=28816a6a49abaaf58232f55ab5b7e9a9f6a2ffa8;hpb=ed920688e7cdc9fd497044379c8d14da0dfaebeb;p=sysdb.git diff --git a/src/include/utils/llist.h b/src/include/utils/llist.h index 28816a6..8d2b96e 100644 --- a/src/include/utils/llist.h +++ b/src/include/utils/llist.h @@ -30,6 +30,8 @@ #include "core/object.h" +#include + #ifdef __cplusplus extern "C" { #endif @@ -40,9 +42,6 @@ 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. @@ -125,7 +124,7 @@ sdb_llist_insert(sdb_llist_t *list, sdb_object_t *obj, size_t idx); */ int sdb_llist_insert_sorted(sdb_llist_t *list, - sdb_object_t *obj, sdb_llist_cmp_cb); + sdb_object_t *obj, sdb_object_cmp_cb); /* * sdb_llist_get: @@ -148,7 +147,7 @@ sdb_llist_get(sdb_llist_t *list, size_t i); */ sdb_object_t * sdb_llist_search(sdb_llist_t *list, - sdb_llist_lookup_cb lookup, const void *user_data); + sdb_object_lookup_cb lookup, const void *user_data); /* * sdb_llist_search_by_name: @@ -175,7 +174,7 @@ sdb_llist_search_by_name(sdb_llist_t *list, const char *key); */ sdb_object_t * sdb_llist_remove(sdb_llist_t *list, - sdb_llist_lookup_cb lookup, const void *user_data); + sdb_object_lookup_cb lookup, const void *user_data); /* * sdb_llist_remove_by_name: @@ -214,7 +213,7 @@ sdb_llist_get_iter(sdb_llist_t *list); void sdb_llist_iter_destroy(sdb_llist_iter_t *iter); -_Bool +bool sdb_llist_iter_has_next(sdb_llist_iter_t *iter); sdb_object_t * sdb_llist_iter_get_next(sdb_llist_iter_t *iter);