Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=35a9b1c8ec518284b1d328cef484a4ef58950aa9
commit 35a9b1c8ec518284b1d328cef484a4ef58950aa9
Author: Michel Hermier <herm...@frugalware.org>
Date: Sun Nov 17 00:13:24 2013 +0100
libpacman: Fix some names in list implementation.
diff --git a/lib/libpacman/util/list.c b/lib/libpacman/util/list.c
index 2be3b57..8f8e885 100644
--- a/lib/libpacman/util/list.c
+++ b/lib/libpacman/util/list.c
@@ -44,10 +44,10 @@ pmlist_t *_pacman_list_new()
return(list);
}
-int f_list_contains(const pmlist_t *list, flist_compar_t compar, const void
*compar_data)
+int f_list_contains(const pmlist_t *list, FListItemComparatorFunc comparator,
const void *comparator_data)
{
for(; list != NULL; list = list->next) {
- if(compar(list, compar_data) == 0) {
+ if(comparator(list, comparator_data) == 0) {
return 1;
}
}
diff --git a/lib/libpacman/util/list.h b/lib/libpacman/util/list.h
index 4a05c81..792b49e 100644
--- a/lib/libpacman/util/list.h
+++ b/lib/libpacman/util/list.h
@@ -23,10 +23,11 @@
#include "pacman.h"
-typedef int (*FVisitorFunc)(void *ptr, void *visitor_data);
+typedef int (*FComparatorFunc)(const void *ptr, const void *visitor_data);
+typedef void (*FVisitorFunc)(void *ptr, void *visitor_data);
-typedef int (*flist_compar_t)(const pmlist_t *item, const void *compar_data);
-typedef int (*FListItemVisitorFunc)(pmlist_t *item, void *visitor_data);
+typedef int (*FListItemComparatorFunc)(const pmlist_t *item, const void
*comparator_data);
+typedef void (*FListItemVisitorFunc)(pmlist_t *item, void *visitor_data);
/* Chained list struct */
struct __pmlist_t {
@@ -45,7 +46,7 @@ typedef int (*_pacman_fn_cmp)(const void *, const void *);
pmlist_t *_pacman_list_new(void);
-int f_list_contains(const pmlist_t *list, flist_compar_t compar, const void
*compar_data);
+int f_list_contains(const pmlist_t *list, FListItemComparatorFunc comparator,
const void *comparator_data);
int _pacman_list_count(const pmlist_t *list);
int _pacman_list_empty(const pmlist_t *list);
int _pacman_list_is_in(void *needle, const pmlist_t *haystack);
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
