Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=aa0065cc39c36d5decef8ccc2c4b49d5bd39917e
commit aa0065cc39c36d5decef8ccc2c4b49d5bd39917e Author: Michel Hermier <[email protected]> Date: Sun May 12 13:38:43 2013 +0200 libflib: Rename f_list_search to f_list_find_custom. diff --git a/lib/libflib/flist.c b/lib/libflib/flist.c index e74438c..9fca22c 100644 --- a/lib/libflib/flist.c +++ b/lib/libflib/flist.c @@ -222,8 +222,17 @@ FList *f_list_filter (FList *list, FDetectFunc dfn, void *user_data) { return ret; } -FList *f_list_find (FList *list, const void *ptr) { - return f_list_search (list, ptr, (FCompareFunc)f_ptrcmp, NULL); +FList *f_list_find (FList *list, const void *data) { + return f_list_find_custom (list, data, (FDetectFunc)f_ptrcmp, NULL); +} + +FList *f_list_find_custom (FList *list, const void *data, FCompareFunc cfn, void *user_data) { + for (; list != NULL; list = list->next) { + if (cfn (list->data, data, user_data) == 0) { + break; + } + } + return list; } void f_list_foreach (FList *list, FVisitorFunc fn, void *user_data) { @@ -256,20 +265,11 @@ void f_list_reverse_foreach (FList *list, FVisitorFunc fn, void *user_data) { } } -FList *f_list_search (FList *list, const void *ptr, FCompareFunc fn, void *user_data) { - for (; list != NULL; list = list->next) { - if (fn (list->data, ptr, user_data) == 0) { - break; - } - } - return list; -} - FList *f_list_uniques (FList *list, FCompareFunc fn, void *user_data) { FList *ret = NULL; for (; list != NULL; list = list->next) { - if (f_list_search (ret, list->data, fn, user_data) == NULL) { + if (f_list_find_custom (ret, list->data, fn, user_data) == NULL) { ret = f_list_append (ret, list->data); } } diff --git a/lib/libflib/flist.h b/lib/libflib/flist.h index 43f04f5..89c49fb 100644 --- a/lib/libflib/flist.h +++ b/lib/libflib/flist.h @@ -71,13 +71,13 @@ FList *f_list_deep_copy (FList *list, FCopyFunc fn, void *user_data); void f_list_detach (FList *list, FCopyFunc fn, void *user_data); FList *f_list_detect (FList *list, FDetectFunc fn, void *user_data); FList *f_list_filter (FList *list, FDetectFunc fn, void *user_data); -FList *f_list_find (FList *list, const void *ptr); +FList *f_list_find (FList *list, const void *data); +FList *f_list_find_custom (FList *list, const void *data, FCompareFunc cfn, void *user_data); void f_list_foreach (FList *list, FVisitorFunc fn, void *user_data); void f_list_foreach_filtered (FList *list, FVisitorFunc fn, FDetectFunc dfn, void *user_data); FList *f_list_reverse (FList *list); void f_list_reverse_foreach (FList *list, FVisitorFunc fn, void *user_data); FList *f_list_uniques (FList *list, FCompareFunc fn, void *user_data); -FList *f_list_search (FList *list, const void *ptr, FCompareFunc fn, void *user_data); FList *f_list_add_sorted (FList *list, void *data, FCompareFunc fn, void *user_data); FList *f_list_remove (FList *haystack, void *needle, FCompareFunc fn, void **data); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
