X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_llist.c;h=6a0c6f06411b76e7fa15083bb1d5fd850c9d48f0;hb=6c6314c7ccca4dae0b9233061dbdf36040dadffe;hp=bf5f7e4944e335c6660eb0226cd8d43faa9aa2a8;hpb=62430c784cf53c7dccb6fec021f9bb4c0d790a0f;p=collectd.git 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); }