Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=64b5324d69e817a6efaffb81e877a452ffda696a
commit 64b5324d69e817a6efaffb81e877a452ffda696a Author: Michel Hermier <[email protected]> Date: Mon Aug 18 15:33:53 2014 +0200 libpacman: Rename f_list_(first/last)(_const) to f_ptrlist*. diff --git a/lib/libpacman/kernel/fstr.cpp b/lib/libpacman/kernel/fstr.cpp index 8979fdb..0d43485 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_list_first_const(list); it != f_list_end_const(list); it = it->next) { + for(it = f_ptrlist_first_const(list); it != f_list_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 d00f08a..bb04e3d 100644 --- a/lib/libpacman/util/fptrlist.c +++ b/lib/libpacman/util/fptrlist.c @@ -209,7 +209,7 @@ int f_list_fini(FList *self, FVisitor *visitor) int f_list_append(FList *self, FListItem *item) { - return f_listitem_insert_after(item, f_list_last(self)); + return f_listitem_insert_after(item, f_ptrlist_last(self)); } int f_list_append_unique(FList *self, FListItem *item, FListItemComparatorFunc comparator) @@ -235,7 +235,7 @@ int f_list_count(const FList *list) const FListItem *it; int i; - for(i = 0, it = f_list_first_const(list); it != f_list_end_const(list); it = it->next, i++); + for(i = 0, it = f_ptrlist_first_const(list); it != f_list_end_const(list); it = it->next, i++); return i; } @@ -270,7 +270,7 @@ const FListItem *f_list_find_const(const FList *list, FListItemComparatorFunc co const FListItem *end = f_list_end_const(list); const FListItem *it; - for(it = f_list_first_const(list); it != end; it = it->next) { + for(it = f_ptrlist_first_const(list); it != end; it = it->next) { if(comparator(it, comparator_data) == 0) { break; } @@ -278,43 +278,15 @@ const FListItem *f_list_find_const(const FList *list, FListItemComparatorFunc co return it != end ? it : NULL; } -FListItem *f_list_first(FList *self) -{ - return (FListItem *)f_list_first_const(self); -} - -const FListItem *f_list_first_const(const FList *self) -{ - return (FListItem *)self; -} - void f_list_foreach(const FList *list, FListItemVisitorFunc visitor, void *visitor_data) { const FListItem *it; - for(it = f_list_first_const(list); it != f_list_end_const(list); it = it->next) { + for(it = f_ptrlist_first_const(list); it != f_list_end_const(list); it = it->next) { visitor((FListItem *)it, visitor_data); } } -FListItem *f_list_last(FList *self) -{ - return (FListItem *)f_list_last_const(self); -} - -const FListItem *f_list_last_const(const FList *self) -{ - const FListItem *it; - - ASSERT(self != NULL, RET_ERR(PM_ERR_WRONG_ARGS, NULL)); - - it = f_list_first_const(self); - while(it->next != f_list_end_const(self)) { - it = it->next; - } - return it; -} - FListItem *f_list_rend(FList *self) { return (FListItem *)f_list_rend_const(self); @@ -455,4 +427,32 @@ int f_ptrlist_contains_ptr(const FPtrList *list, const void *ptr) return f_ptrlist_contains(list, f_ptrlistitem_ptrcmp, ptr); } +FPtrListItem *f_ptrlist_first(FPtrList *self) +{ + return (FPtrListItem *)f_ptrlist_first_const(self); +} + +const FPtrListItem *f_ptrlist_first_const(const FPtrList *self) +{ + return (FPtrListItem *)self; +} + +FPtrListItem *f_ptrlist_last(FPtrList *self) +{ + return (FPtrListItem *)f_ptrlist_last_const(self); +} + +const FPtrListItem *f_ptrlist_last_const(const FPtrList *self) +{ + const FPtrListItem *it; + + ASSERT(self != NULL, RET_ERR(PM_ERR_WRONG_ARGS, NULL)); + + it = f_ptrlist_first_const(self); + while(it->next != f_ptrlist_end_const(self)) { + it = it->next; + } + return it; +} + /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libpacman/util/fptrlist.h b/lib/libpacman/util/fptrlist.h index 0965069..c25dff5 100644 --- a/lib/libpacman/util/fptrlist.h +++ b/lib/libpacman/util/fptrlist.h @@ -100,11 +100,8 @@ 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); const FListItem *f_list_find_const(const FList *self, FListItemComparatorFunc comparator, const void *comparator_data); -FListItem *f_list_first(FList *self); -const FListItem *f_list_first_const(const FList *self); void f_list_foreach(const FList *list, FListItemVisitorFunc visitor, void *visitor_data); -FListItem *f_list_last(FList *self); -const FListItem *f_list_last_const(const FList *self); + FListItem *f_list_rend(FList *self); const FListItem *f_list_rend_const(const FList *self); @@ -139,10 +136,10 @@ int f_ptrlist_contains_ptr(const FPtrList *list, const void *ptr); #define f_ptrlist_empty f_list_empty #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))) -#define f_ptrlist_first(self) ((FPtrListItem *)f_ptrlist_first_const(self)) -#define f_ptrlist_first_const(self) ((const FPtrListItem *)f_list_first_const(f_ptrlist_as_FList_const(self))) -#define f_ptrlist_last(self) ((FPtrListItem *)f_ptrlist_last_const(self)) -#define f_ptrlist_last_const(self) ((const FPtrListItem *)f_list_last_const(f_ptrlist_as_FList_const(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); #ifdef __cplusplus } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
