Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=1d352750c47784e6dc45ed05bf53e756530bbc59
commit 1d352750c47784e6dc45ed05bf53e756530bbc59 Author: Michel Hermier <[email protected]> Date: Mon Aug 18 20:01:06 2014 +0200 libpacman: Move f_list_(r)end(_const) to f_ptrlist_*. diff --git a/lib/libpacman/kernel/fstr.cpp b/lib/libpacman/kernel/fstr.cpp index 0d43485..4423cc1 100644 --- a/lib/libpacman/kernel/fstr.cpp +++ b/lib/libpacman/kernel/fstr.cpp @@ -82,7 +82,7 @@ int f_stringlist_any_match(const FStringList *list, const FStrMatcher *matcher) { const FStringListItem *it; - for(it = f_ptrlist_first_const(list); it != f_list_end_const(list); it = it->next) { + for(it = f_ptrlist_first_const(list); it != f_ptrlist_end_const(list); it = it->next) { if(matcher->match(f_stringlistitem_to_str(it)) != 0) { return 1; } diff --git a/lib/libpacman/util/fptrlist.c b/lib/libpacman/util/fptrlist.c index 6682e2c..dd5ec44 100644 --- a/lib/libpacman/util/fptrlist.c +++ b/lib/libpacman/util/fptrlist.c @@ -149,16 +149,6 @@ int f_list_contains(const FPtrList *list, FPtrListItemComparatorFunc comparator, return f_list_find_const(list, comparator, comparator_data) != NULL; } -FPtrListItem *f_list_end(FPtrList *self) -{ - return (FPtrListItem *)f_list_end_const(self); -} - -const FPtrListItem *f_list_end_const(const FPtrList *self) -{ - return NULL; -} - FPtrListItem *f_list_find(FPtrList *self, FPtrListItemComparatorFunc comparator, const void *comparator_data) { return (FPtrListItem *)f_list_find_const(self, comparator, comparator_data); @@ -166,7 +156,7 @@ FPtrListItem *f_list_find(FPtrList *self, FPtrListItemComparatorFunc comparator, const FPtrListItem *f_list_find_const(const FPtrList *list, FPtrListItemComparatorFunc comparator, const void *comparator_data) { - const FPtrListItem *end = f_list_end_const(list); + const FPtrListItem *end = f_ptrlist_end_const(list); const FPtrListItem *it; for(it = f_ptrlist_first_const(list); it != end; it = it->next) { @@ -181,21 +171,11 @@ void f_list_foreach(const FPtrList *list, FPtrListItemVisitorFunc visitor, void { const FPtrListItem *it; - for(it = f_ptrlist_first_const(list); it != f_list_end_const(list); it = it->next) { + for(it = f_ptrlist_first_const(list); it != f_ptrlist_end_const(list); it = it->next) { visitor((FPtrListItem *)it, visitor_data); } } -FPtrListItem *f_list_rend(FPtrList *self) -{ - return (FPtrListItem *)f_list_rend_const(self); -} - -const FPtrListItem *f_list_rend_const(const FPtrList *self) -{ - return NULL; -} - FPtrListItem *f_ptrlistitem_new(void *ptr) { FPtrListItem *item = f_zalloc(sizeof(*item)); @@ -345,7 +325,7 @@ int f_ptrlist_count(const FPtrList *self) const FPtrListItem *it; int i; - for(i = 0, it = f_ptrlist_first_const(self); it != f_list_end_const(self); it = it->next, i++); + for(i = 0, it = f_ptrlist_first_const(self); it != f_ptrlist_end_const(self); it = it->next, i++); return i; } @@ -354,6 +334,16 @@ bool f_ptrlist_empty(const FPtrList *self) return self == NULL; } +FPtrListItem *f_ptrlist_end(FPtrList *self) +{ + return (FPtrListItem *)f_ptrlist_end_const(self); +} + +const FPtrListItem *f_ptrlist_end_const(const FPtrList *self) +{ + return NULL; +} + FPtrListItem *f_ptrlist_first(FPtrList *self) { return (FPtrListItem *)f_ptrlist_first_const(self); @@ -382,4 +372,14 @@ const FPtrListItem *f_ptrlist_last_const(const FPtrList *self) return it; } +FPtrListItem *f_ptrlist_rend(FPtrList *self) +{ + return (FPtrListItem *)f_ptrlist_rend_const(self); +} + +const FPtrListItem *f_ptrlist_rend_const(const FPtrList *self) +{ + return NULL; +} + /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libpacman/util/fptrlist.h b/lib/libpacman/util/fptrlist.h index 7345242..46e4281 100644 --- a/lib/libpacman/util/fptrlist.h +++ b/lib/libpacman/util/fptrlist.h @@ -74,14 +74,10 @@ 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_end(FPtrList *self); -const FPtrListItem *f_list_end_const(const FPtrList *self); 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_list_rend(FPtrList *self); -const FPtrListItem *f_list_rend_const(const FPtrList *self); FPtrListItem *f_ptrlistitem_new(void *data); int f_ptrlistitem_delete(FPtrListItem *self, FVisitor *visitor); @@ -110,12 +106,14 @@ int f_ptrlist_clear(FPtrList *list, FVisitor *visitor); int f_ptrlist_contains_ptr(const FPtrList *list, const void *ptr); 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(list)) +FPtrListItem *f_ptrlist_end(FPtrList *self); +const FPtrListItem *f_ptrlist_end_const(const FPtrList *self); FPtrListItem *f_ptrlist_first(FPtrList *self); const FPtrListItem *f_ptrlist_first_const(const FPtrList *self); FPtrListItem *f_ptrlist_last(FPtrList *self); const FPtrListItem *f_ptrlist_last_const(const FPtrList *self); +FPtrListItem *f_ptrlist_rend(FPtrList *self); +const FPtrListItem *f_ptrlist_rend_const(const FPtrList *self); #ifdef __cplusplus } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
