Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=4dc6861de971b93436664b65ac2a27bb0974fdd1
commit 4dc6861de971b93436664b65ac2a27bb0974fdd1 Author: Michel Hermier <herm...@frugalware.org> Date: Sun Nov 17 00:24:53 2013 +0100 libpacman: Introduce FList and FPtrList names. diff --git a/lib/libpacman/util/list.c b/lib/libpacman/util/list.c index 8f8e885..f8d6e9d 100644 --- a/lib/libpacman/util/list.c +++ b/lib/libpacman/util/list.c @@ -30,9 +30,9 @@ #include "fstdlib.h" #include "util.h" -pmlist_t *_pacman_list_new() +FList *_pacman_list_new() { - pmlist_t *list = _pacman_malloc(sizeof(pmlist_t)); + FList *list = _pacman_malloc(sizeof(*list)); if(list == NULL) { return(NULL); @@ -44,7 +44,7 @@ pmlist_t *_pacman_list_new() return(list); } -int f_list_contains(const pmlist_t *list, FListItemComparatorFunc comparator, const void *comparator_data) +int f_list_contains(const FList *list, FListItemComparatorFunc comparator, const void *comparator_data) { for(; list != NULL; list = list->next) { if(comparator(list, comparator_data) == 0) { @@ -54,30 +54,29 @@ int f_list_contains(const pmlist_t *list, FListItemComparatorFunc comparator, co return 0; } -int _pacman_list_count(const pmlist_t *list) +int _pacman_list_count(const FList *list) { int i; - const pmlist_t *lp; - for(lp = list, i = 0; lp; lp = lp->next, i++); + for(i = 0; list; list = list->next, i++); return(i); } -int _pacman_list_empty(const pmlist_t *list) +int _pacman_list_empty(const FList *list) { return list == NULL; } -void f_list_foreach(const pmlist_t *list, FListItemVisitorFunc visitor, void *visitor_data) +void f_list_foreach(const FList *list, FListItemVisitorFunc visitor, void *visitor_data) { for(; list != NULL; list = list->next) { - visitor((pmlist_t *)list, visitor_data); + visitor((FListItem *)list, visitor_data); } } static -int _pacman_ptrlistitem_ptrcmp(const pmlist_t *item, const void *ptr) { +int _pacman_ptrlistitem_ptrcmp(const FListItem *item, const void *ptr) { return f_ptrcmp(item->data, ptr); } @@ -246,14 +245,14 @@ pmlist_t *_pacman_list_reverse(pmlist_t *list) return(newlist); } -void f_ptrlist_free(pmlist_t *list, FVisitorFunc visitor, void *visitor_data) +void f_ptrlist_free(FPtrList *list, FVisitorFunc visitor, void *visitor_data) { f_ptrlist_clear(list, visitor, visitor_data); } -void f_ptrlist_clear(pmlist_t *list, FVisitorFunc visitor, void *visitor_data) +void f_ptrlist_clear(FPtrList *list, FVisitorFunc visitor, void *visitor_data) { - pmlist_t *next; + FPtrList *next; while(list != NULL) { next = list->next; diff --git a/lib/libpacman/util/list.h b/lib/libpacman/util/list.h index 792b49e..888b986 100644 --- a/lib/libpacman/util/list.h +++ b/lib/libpacman/util/list.h @@ -26,8 +26,11 @@ typedef int (*FComparatorFunc)(const void *ptr, const void *visitor_data); typedef void (*FVisitorFunc)(void *ptr, void *visitor_data); -typedef int (*FListItemComparatorFunc)(const pmlist_t *item, const void *comparator_data); -typedef void (*FListItemVisitorFunc)(pmlist_t *item, void *visitor_data); +typedef struct __pmlist_t FList; +typedef struct __pmlist_t FListItem; + +typedef int (*FListItemComparatorFunc)(const FListItem *item, const void *comparator_data); +typedef void (*FListItemVisitorFunc)(FListItem *item, void *visitor_data); /* Chained list struct */ struct __pmlist_t { @@ -44,13 +47,13 @@ struct __pmlist_t { /* Sort comparison callback function declaration */ typedef int (*_pacman_fn_cmp)(const void *, const void *); -pmlist_t *_pacman_list_new(void); +FList *_pacman_list_new(void); -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 f_list_contains(const FList *list, FListItemComparatorFunc comparator, const void *comparator_data); +int _pacman_list_count(const FList *list); +int _pacman_list_empty(const FList *list); int _pacman_list_is_in(void *needle, const pmlist_t *haystack); -void f_list_foreach(const pmlist_t *list, FListItemVisitorFunc visitor, void *visitor_data); +void f_list_foreach(const FList *list, FListItemVisitorFunc visitor, void *visitor_data); pmlist_t *_pacman_list_add(pmlist_t *list, void *data); pmlist_t *_pacman_list_add_sorted(pmlist_t *list, void *data, _pacman_fn_cmp fn); @@ -58,9 +61,12 @@ pmlist_t *_pacman_list_remove(pmlist_t *haystack, void *needle, _pacman_fn_cmp f pmlist_t *_pacman_list_last(pmlist_t *list); pmlist_t *_pacman_list_reverse(pmlist_t *list); -void f_ptrlist_free(pmlist_t *list, FVisitorFunc visitor, void *visitor_data); +typedef struct __pmlist_t FPtrList; +typedef struct __pmlist_t FPtrListItem; + +void f_ptrlist_free(FPtrList *list, FVisitorFunc visitor, void *visitor_data); -void f_ptrlist_clear(pmlist_t *list, FVisitorFunc visitor, void *visitor_data); +void f_ptrlist_clear(FPtrList *list, FVisitorFunc visitor, void *visitor_data); #endif /* _PACMAN_LIST_H */ _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git