From e3a2581365e2a1bd98a0e5419644f8919a080b5d Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Wed, 24 Mar 2010 23:08:34 +0100 Subject: [PATCH] utils_llist: Added `llist_search_custom()'. This function may be used for lookups using a custom compare function, i.e. lookups that are not necessarily based on the name of the registered list entry but some information specific to the used data-type. --- src/utils_llist.c | 23 +++++++++++++++++++++-- src/utils_llist.h | 2 ++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/utils_llist.c b/src/utils_llist.c index bf5f7e49..6a0c6f06 100644 --- a/src/utils_llist.c +++ b/src/utils_llist.c @@ -139,17 +139,36 @@ int llist_size (llist_t *l) return (l ? l->size : 0); } +static int llist_strcmp (llentry_t *e, void *ud) +{ + if ((e == NULL) || (ud == NULL)) + return (-1); + return (strcmp (e->key, (const char *)ud)); +} + llentry_t *llist_search (llist_t *l, const char *key) { + return (llist_search_custom (l, llist_strcmp, (void *)key)); +} + +llentry_t *llist_search_custom (llist_t *l, + int (*compare) (llentry_t *, void *), void *user_data) +{ llentry_t *e; if (l == NULL) return (NULL); - for (e = l->head; e != NULL; e = e->next) - if (strcmp (key, e->key) == 0) + e = l->head; + while (e != NULL) { + llentry_t *next = e->next; + + if (compare (e, user_data) == 0) break; + e = next; + } + return (e); } diff --git a/src/utils_llist.h b/src/utils_llist.h index c3753d83..19d8d947 100644 --- a/src/utils_llist.h +++ b/src/utils_llist.h @@ -54,6 +54,8 @@ void llist_remove (llist_t *l, llentry_t *e); int llist_size (llist_t *l); llentry_t *llist_search (llist_t *l, const char *key); +llentry_t *llist_search_custom (llist_t *l, + int (*compare) (llentry_t *, void *), void *user_data); llentry_t *llist_head (llist_t *l); llentry_t *llist_tail (llist_t *l); -- 2.11.0