Moved compare and lookup callback types from utils/llist to core/object.

diff --git a/src/include/core/object.h b/src/include/core/object.h
index 819d11e849b48d4e1e2eb65d35247f4abe22af29..42352b085876b48cbbaca7716670d05c4bc06d14 100644 (file)
--- a/src/include/core/object.h
+++ b/src/include/core/object.h
@@ -68,6 +68,12 @@ typedef struct {
 #define SDB_OBJ_WRAPPER(obj) ((sdb_object_wrapper_t *)(obj))
 #define SDB_CONST_OBJ_WRAPPER(obj) ((const sdb_object_wrapper_t *)(obj))
 
+/*
+ * Callback types for comparing objects or performing object lookup.
+ */
+typedef int (*sdb_object_cmp_cb)(const sdb_object_t *, const sdb_object_t *);
+typedef int (*sdb_object_lookup_cb)(const sdb_object_t *, const void *user_data);
+
 /*
  * sdb_object_create:
  * Allocates a new sdb_object_t of the specified 'name' and 'type'. The object

diff --git a/src/include/utils/llist.h b/src/include/utils/llist.h
index 28816a6a49abaaf58232f55ab5b7e9a9f6a2ffa8..1dddb7e0747391a677ac267f36560b2d385d2a89 100644 (file)
--- a/src/include/utils/llist.h
+++ b/src/include/utils/llist.h
@@ -40,9 +40,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 +122,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 +145,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 +172,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:

diff --git a/src/utils/llist.c b/src/utils/llist.c
index f9bf722785dab30087c2c6e796858f3decd3f4a7..03ffd95350f5acf992a7d9edd27acc7ed45c18b3 100644 (file)
--- a/src/utils/llist.c
+++ b/src/utils/llist.c
@@ -141,7 +141,7 @@ llist_insert_after(sdb_llist_t *list, sdb_llist_elem_t *elem,
 
 static sdb_llist_elem_t *
 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_elem_t *elem;
 
@@ -297,7 +297,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 compare)
+               sdb_object_t *obj, sdb_object_cmp_cb compare)
 {
        sdb_llist_elem_t *prev;
        sdb_llist_elem_t *next;
@@ -343,7 +343,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_elem_t *elem;
 
@@ -382,7 +382,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_elem_t *elem;
        sdb_object_t *obj = NULL;