Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=10169b008e49cbfe4fb2958282ac97c1f19c1751
commit 10169b008e49cbfe4fb2958282ac97c1f19c1751 Author: Michel Hermier <[email protected]> Date: Mon Aug 18 15:39:23 2014 +0200 libpacman: Rename f_list_(count/empty) to FPtrList. diff --git a/lib/libpacman/util/fptrlist.c b/lib/libpacman/util/fptrlist.c index bb04e3d..4302f09 100644 --- a/lib/libpacman/util/fptrlist.c +++ b/lib/libpacman/util/fptrlist.c @@ -230,20 +230,6 @@ int f_list_contains(const FList *list, FListItemComparatorFunc comparator, const return f_list_find_const(list, comparator, comparator_data) != NULL; } -int f_list_count(const FList *list) -{ - const FListItem *it; - int i; - - for(i = 0, it = f_ptrlist_first_const(list); it != f_list_end_const(list); it = it->next, i++); - return i; -} - -int f_list_empty(const FList *list) -{ - return list == NULL; -} - FListItem *f_list_end(FList *self) { return (FListItem *)f_list_end_const(self); @@ -427,6 +413,20 @@ int f_ptrlist_contains_ptr(const FPtrList *list, const void *ptr) return f_ptrlist_contains(list, f_ptrlistitem_ptrcmp, ptr); } +int f_ptrlist_count(const FPtrList *self) +{ + const FListItem *it; + int i; + + for(i = 0, it = f_ptrlist_first_const(self); it != f_list_end_const(self); it = it->next, i++); + return i; +} + +bool f_ptrlist_empty(const FPtrList *self) +{ + return self == NULL; +} + FPtrListItem *f_ptrlist_first(FPtrList *self) { return (FPtrListItem *)f_ptrlist_first_const(self); diff --git a/lib/libpacman/util/fptrlist.h b/lib/libpacman/util/fptrlist.h index c25dff5..5892192 100644 --- a/lib/libpacman/util/fptrlist.h +++ b/lib/libpacman/util/fptrlist.h @@ -24,6 +24,8 @@ #include "pacman.h" +#include "stdbool.h" + #include "util/fcallback.h" #ifdef __cplusplus @@ -94,8 +96,6 @@ int f_list_append(FList *self, FListItem *item); int f_list_append_unique(FList *self, FListItem *item, FListItemComparatorFunc comparator); int f_list_clear(FList *self, FVisitor *visitor); int f_list_contains(const FList *list, FListItemComparatorFunc comparator, const void *comparator_data); -int f_list_count(const FList *list); -int f_list_empty(const FList *list); FListItem *f_list_end(FList *self); const FListItem *f_list_end_const(const FList *self); FListItem *f_list_find(FList *self, FListItemComparatorFunc comparator, const void *comparator_data); @@ -132,8 +132,8 @@ int f_ptrlist_append(FPtrList *list, void *data); int f_ptrlist_clear(FPtrList *list, FVisitor *visitor); #define f_ptrlist_contains(self, comparator, comparator_data) f_list_contains(f_ptrlist_as_FList_const(self), (FListItemComparatorFunc)comparator, comparator_data) int f_ptrlist_contains_ptr(const FPtrList *list, const void *ptr); -#define f_ptrlist_count f_list_count -#define f_ptrlist_empty f_list_empty +int f_ptrlist_count(const FPtrList *self); +bool f_ptrlist_empty(const FPtrList *self); #define f_ptrlist_end(list) ((FPtrListItem *)f_ptrlist_end_const(list)) #define f_ptrlist_end_const(list) ((const FPtrListItem *)f_list_end_const(f_ptrlist_as_FList_const(list))) FPtrListItem *f_ptrlist_first(FPtrList *self); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
