Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=a158bd3a7c385f94c30c53dafef50d999ac410e7
commit a158bd3a7c385f94c30c53dafef50d999ac410e7 Author: Michel Hermier <[email protected]> Date: Mon Aug 18 20:11:06 2014 +0200 libpacman: Move the last f_list_* methods goes to f_ptrlist_*. diff --git a/lib/libpacman/util/fptrlist.c b/lib/libpacman/util/fptrlist.c index dd5ec44..70ff003 100644 --- a/lib/libpacman/util/fptrlist.c +++ b/lib/libpacman/util/fptrlist.c @@ -144,38 +144,6 @@ FPtrList *f_list_new() #endif } -int f_list_contains(const FPtrList *list, FPtrListItemComparatorFunc comparator, const void *comparator_data) -{ - return f_list_find_const(list, comparator, comparator_data) != NULL; -} - -FPtrListItem *f_list_find(FPtrList *self, FPtrListItemComparatorFunc comparator, const void *comparator_data) -{ - return (FPtrListItem *)f_list_find_const(self, comparator, comparator_data); -} - -const FPtrListItem *f_list_find_const(const FPtrList *list, FPtrListItemComparatorFunc comparator, const void *comparator_data) -{ - const FPtrListItem *end = f_ptrlist_end_const(list); - const FPtrListItem *it; - - for(it = f_ptrlist_first_const(list); it != end; it = it->next) { - if(comparator(it, comparator_data) == 0) { - break; - } - } - return it != end ? it : NULL; -} - -void f_list_foreach(const FPtrList *list, FPtrListItemVisitorFunc visitor, void *visitor_data) -{ - const FPtrListItem *it; - - for(it = f_ptrlist_first_const(list); it != f_ptrlist_end_const(list); it = it->next) { - visitor((FPtrListItem *)it, visitor_data); - } -} - FPtrListItem *f_ptrlistitem_new(void *ptr) { FPtrListItem *item = f_zalloc(sizeof(*item)); @@ -315,7 +283,12 @@ int f_ptrlist_clear(FPtrList *list, FVisitor *visitor) return 0; } -int f_ptrlist_contains_ptr(const FPtrList *list, const void *ptr) +bool f_ptrlist_contains(const FPtrList *list, FPtrListItemComparatorFunc comparator, const void *comparator_data) +{ + return f_ptrlist_find_const(list, comparator, comparator_data) != NULL; +} + +bool f_ptrlist_contains_ptr(const FPtrList *list, const void *ptr) { return f_ptrlist_contains(list, f_ptrlistitem_ptrcmp, ptr); } @@ -344,6 +317,24 @@ const FPtrListItem *f_ptrlist_end_const(const FPtrList *self) return NULL; } +FPtrListItem *f_ptrlist_find(FPtrList *self, FPtrListItemComparatorFunc comparator, const void *comparator_data) +{ + return (FPtrListItem *)f_ptrlist_find_const(self, comparator, comparator_data); +} + +const FPtrListItem *f_ptrlist_find_const(const FPtrList *list, FPtrListItemComparatorFunc comparator, const void *comparator_data) +{ + const FPtrListItem *end = f_ptrlist_end_const(list); + const FPtrListItem *it; + + for(it = f_ptrlist_first_const(list); it != end; it = it->next) { + if(comparator(it, comparator_data) == 0) { + break; + } + } + return it != end ? it : NULL; +} + FPtrListItem *f_ptrlist_first(FPtrList *self) { return (FPtrListItem *)f_ptrlist_first_const(self); @@ -354,6 +345,15 @@ const FPtrListItem *f_ptrlist_first_const(const FPtrList *self) return (FPtrListItem *)self; } +void f_list_foreach(const FPtrList *list, FPtrListItemVisitorFunc visitor, void *visitor_data) +{ + const FPtrListItem *it; + + for(it = f_ptrlist_first_const(list); it != f_ptrlist_end_const(list); it = it->next) { + visitor((FPtrListItem *)it, visitor_data); + } +} + FPtrListItem *f_ptrlist_last(FPtrList *self) { return (FPtrListItem *)f_ptrlist_last_const(self); diff --git a/lib/libpacman/util/fptrlist.h b/lib/libpacman/util/fptrlist.h index 46e4281..7ef6d6d 100644 --- a/lib/libpacman/util/fptrlist.h +++ b/lib/libpacman/util/fptrlist.h @@ -73,12 +73,6 @@ typedef void (*FPtrListItemVisitorFunc)(FPtrListItem *item, void *visitor_data); FPtrList *f_list_new(void); -int f_list_contains(const FPtrList *list, FPtrListItemComparatorFunc comparator, const void *comparator_data); -FPtrListItem *f_list_find(FPtrList *self, FPtrListItemComparatorFunc comparator, const void *comparator_data); -const FPtrListItem *f_list_find_const(const FPtrList *self, FPtrListItemComparatorFunc comparator, const void *comparator_data); -void f_list_foreach(const FPtrList *list, FPtrListItemVisitorFunc visitor, void *visitor_data); - - FPtrListItem *f_ptrlistitem_new(void *data); int f_ptrlistitem_delete(FPtrListItem *self, FVisitor *visitor); @@ -102,14 +96,17 @@ FPtrList *f_ptrlist_append(FPtrList *list, void *data); int f_ptrlist_append(FPtrList *list, void *data); #endif int f_ptrlist_clear(FPtrList *list, FVisitor *visitor); -#define f_ptrlist_contains(self, comparator, comparator_data) f_list_contains(self, (FPtrListItemComparatorFunc)comparator, comparator_data) -int f_ptrlist_contains_ptr(const FPtrList *list, const void *ptr); +bool f_ptrlist_contains(const FPtrList *list, FPtrListItemComparatorFunc comparator, const void *comparator_data); +bool f_ptrlist_contains_ptr(const FPtrList *list, const void *ptr); int f_ptrlist_count(const FPtrList *self); bool f_ptrlist_empty(const FPtrList *self); FPtrListItem *f_ptrlist_end(FPtrList *self); const FPtrListItem *f_ptrlist_end_const(const FPtrList *self); +FPtrListItem *f_ptrlist_find(FPtrList *self, FPtrListItemComparatorFunc comparator, const void *comparator_data); +const FPtrListItem *f_ptrlist_find_const(const FPtrList *self, FPtrListItemComparatorFunc comparator, const void *comparator_data); FPtrListItem *f_ptrlist_first(FPtrList *self); const FPtrListItem *f_ptrlist_first_const(const FPtrList *self); +void f_ptrlist_foreach(const FPtrList *list, FPtrListItemVisitorFunc visitor, void *visitor_data); FPtrListItem *f_ptrlist_last(FPtrList *self); const FPtrListItem *f_ptrlist_last_const(const FPtrList *self); FPtrListItem *f_ptrlist_rend(FPtrList *self); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
