Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=2f5f35c275ff1dd9b3dd7495e604ce3aceb703d0
commit 2f5f35c275ff1dd9b3dd7495e604ce3aceb703d0 Author: Michel Hermier <[email protected]> Date: Mon Aug 25 08:45:09 2014 +0200 libpacman: s/FPtrListItem/FStringListIterator/ diff --git a/lib/libpacman/pacman.cpp b/lib/libpacman/pacman.cpp index ba7ef7d..a5bb290 100644 --- a/lib/libpacman/pacman.cpp +++ b/lib/libpacman/pacman.cpp @@ -1336,7 +1336,7 @@ pmlist_iterator_t *pacman_list_iterator_next(pmlist_iterator_t *iterator) { ASSERT(iterator != NULL, return NULL); - return (pmlist_iterator_t *)((FPtrListItem *)iterator)->next(); + return (pmlist_iterator_t *)((FPtrListIterator *)iterator)->next(); } /** Get the data of a list iterator. @@ -1347,7 +1347,7 @@ void *pacman_list_iterator_getdata(pmlist_iterator_t *iterator) { ASSERT(iterator != NULL, return NULL); - return f_ptrlistitem_data((FPtrListItem *)iterator); + return f_ptrlistitem_data((FPtrListIterator *)iterator); } /** @} */ diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index 017f74e..63f4cf4 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -435,7 +435,7 @@ int __pmtrans_t::add(const char *target, pmtranstype_t type, int flags) /* check if an older version of said package is already in transaction packages. * if so, replace it in the list */ - FPtrListItem *i; + FPtrListIterator *i; auto end = packages->end(); for(i = packages->begin(); i != end; i = i->next()) { Package *pkg = f_ptrlistitem_data(i); diff --git a/lib/libpacman/util/fdispatchlogger.c b/lib/libpacman/util/fdispatchlogger.c index 49d1d66..0fba992 100644 --- a/lib/libpacman/util/fdispatchlogger.c +++ b/lib/libpacman/util/fdispatchlogger.c @@ -35,10 +35,8 @@ static void f_dispatchlogger_log(unsigned char flag, const char *message, void *data) { FPtrList *list = (FPtrList *)data; - FPtrListItem *end, *it; - end = f_ptrlist_end(list); - for (it = f_ptrlist_first(list); it != end; it = f_ptrlistitem_next(it)) { + for (auto it = f_ptrlist_first(list), end = f_ptrlist_end(list); it != end; it = f_ptrlistitem_next(it)) { f_logger_logs((FLogger *)f_ptrlistitem_data(it), flag, message); } } diff --git a/lib/libpacman/util/fptrlist.cpp b/lib/libpacman/util/fptrlist.cpp index 071fb01..c709b2d 100644 --- a/lib/libpacman/util/fptrlist.cpp +++ b/lib/libpacman/util/fptrlist.cpp @@ -31,7 +31,7 @@ */ FPtrList *f_ptrlist_add_sorted(FPtrList *list, void *data, _pacman_fn_cmp fn) { - FPtrListItem *add, *end = f_ptrlist_end(list), *previous = NULL, *iter = f_ptrlist_first(list); + FPtrListIterator *add, *end = f_ptrlist_end(list), *previous = NULL, *iter = f_ptrlist_first(list); add = f_ptrlistitem_new(data); @@ -67,7 +67,7 @@ FPtrList *f_ptrlist_add_sorted(FPtrList *list, void *data, _pacman_fn_cmp fn) */ FPtrList *_pacman_list_remove(FPtrList *haystack, void *needle, _pacman_fn_cmp fn, void **data) { - FPtrListItem *end = f_ptrlist_end(haystack), *i = f_ptrlist_first(haystack); + FPtrListIterator *end = f_ptrlist_end(haystack), *i = f_ptrlist_first(haystack); if(*data != end) { *data = NULL; @@ -133,9 +133,9 @@ FPtrList *f_list_new() #endif } -FPtrListItem *f_ptrlistitem_new(void *ptr) +FPtrListIterator *f_ptrlistitem_new(void *ptr) { - FPtrListItem *item = f_zalloc(sizeof(*item)); + FPtrListIterator *item = f_zalloc(sizeof(*item)); if(item != NULL) { item->m_data = ptr; @@ -143,7 +143,7 @@ FPtrListItem *f_ptrlistitem_new(void *ptr) return item; } -int f_ptrlistitem_delete(FPtrListItem *self, FVisitor *visitor) +int f_ptrlistitem_delete(FPtrListIterator *self, FVisitor *visitor) { ASSERT(self != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); @@ -152,16 +152,16 @@ int f_ptrlistitem_delete(FPtrListItem *self, FVisitor *visitor) return 0; } -void *f_ptrlistitem_data(const FPtrListItem *self) +void *f_ptrlistitem_data(const FPtrListIterator *self) { ASSERT(self != NULL, RET_ERR(PM_ERR_WRONG_ARGS, NULL)); return self->m_data; } -int f_ptrlistitem_insert_after(FPtrListItem *self, FPtrListItem *previous) +int f_ptrlistitem_insert_after(FPtrListIterator *self, FPtrListIterator *previous) { - FPtrListItem *next; + FPtrListIterator *next; ASSERT(self != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); ASSERT(previous != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); @@ -177,21 +177,21 @@ int f_ptrlistitem_insert_after(FPtrListItem *self, FPtrListItem *previous) return 0; } -FPtrListItem *f_ptrlistitem_next(FPtrListItem *self) +FPtrListIterator *f_ptrlistitem_next(FPtrListIterator *self) { ASSERT(self != NULL, RET_ERR(PM_ERR_WRONG_ARGS, NULL)); return self->m_next; } -FPtrListItem *f_ptrlistitem_previous(FPtrListItem *self) +FPtrListIterator *f_ptrlistitem_previous(FPtrListIterator *self) { ASSERT(self != NULL, RET_ERR(PM_ERR_WRONG_ARGS, NULL)); return self->m_previous; } -int f_ptrlistitem_ptrcmp(const FPtrListItem *item, const void *ptr) { +int f_ptrlistitem_ptrcmp(const FPtrListIterator *item, const void *ptr) { return f_ptrcmp(item->m_data, ptr); } @@ -260,7 +260,7 @@ FPtrList *f_ptrlist_append(FPtrList *list, void *data) int f_ptrlist_clear(FPtrList *list, FVisitor *visitor) { - FPtrListItem *end = f_ptrlist_end(list), *it = f_ptrlist_first(list), *next; + FPtrListIterator *end = f_ptrlist_end(list), *it = f_ptrlist_first(list), *next; while(it != end) { next = it->next(); @@ -273,7 +273,7 @@ int f_ptrlist_clear(FPtrList *list, FVisitor *visitor) return 0; } -bool f_ptrlist_contains(const FPtrList *list, FPtrListItemComparatorFunc comparator, const void *comparator_data) +bool f_ptrlist_contains(const FPtrList *list, FPtrListIteratorComparatorFunc comparator, const void *comparator_data) { return f_ptrlist_find_const(list, comparator, comparator_data) != NULL; } @@ -304,22 +304,22 @@ bool f_ptrlist_empty(const FPtrList *self) #endif } -FPtrListItem *f_ptrlist_end(FPtrList *self) +FPtrListIterator *f_ptrlist_end(FPtrList *self) { - return (FPtrListItem *)f_ptrlist_end_const(self); + return (FPtrListIterator *)f_ptrlist_end_const(self); } -const FPtrListItem *f_ptrlist_end_const(const FPtrList *self) +const FPtrListIterator *f_ptrlist_end_const(const FPtrList *self) { return NULL; } -FPtrListItem *f_ptrlist_find(FPtrList *self, FPtrListItemComparatorFunc comparator, const void *comparator_data) +FPtrListIterator *f_ptrlist_find(FPtrList *self, FPtrListIteratorComparatorFunc comparator, const void *comparator_data) { - return (FPtrListItem *)f_ptrlist_find_const(self, comparator, comparator_data); + return (FPtrListIterator *)f_ptrlist_find_const(self, comparator, comparator_data); } -const FPtrListItem *f_ptrlist_find_const(const FPtrList *list, FPtrListItemComparatorFunc comparator, const void *comparator_data) +const FPtrListIterator *f_ptrlist_find_const(const FPtrList *list, FPtrListIteratorComparatorFunc comparator, const void *comparator_data) { for(auto it = list->cbegin(), end = list->cend(); it != end; it = it->m_next) { if(comparator(it, comparator_data) == 0) { @@ -329,24 +329,24 @@ const FPtrListItem *f_ptrlist_find_const(const FPtrList *list, FPtrListItemCompa return NULL; } -FPtrListItem *f_ptrlist_first(FPtrList *self) +FPtrListIterator *f_ptrlist_first(FPtrList *self) { - return (FPtrListItem *)f_ptrlist_first_const(self); + return (FPtrListIterator *)f_ptrlist_first_const(self); } -const FPtrListItem *f_ptrlist_first_const(const FPtrList *self) +const FPtrListIterator *f_ptrlist_first_const(const FPtrList *self) { - return (FPtrListItem *)self; + return (FPtrListIterator *)self; } -FPtrListItem *f_ptrlist_last(FPtrList *self) +FPtrListIterator *f_ptrlist_last(FPtrList *self) { - return (FPtrListItem *)f_ptrlist_last_const(self); + return (FPtrListIterator *)f_ptrlist_last_const(self); } -const FPtrListItem *f_ptrlist_last_const(const FPtrList *self) +const FPtrListIterator *f_ptrlist_last_const(const FPtrList *self) { - const FPtrListItem *it; + const FPtrListIterator *it; ASSERT(self != NULL, RET_ERR(PM_ERR_WRONG_ARGS, NULL)); @@ -357,12 +357,12 @@ const FPtrListItem *f_ptrlist_last_const(const FPtrList *self) return it; } -FPtrListItem *f_ptrlist_rend(FPtrList *self) +FPtrListIterator *f_ptrlist_rend(FPtrList *self) { - return (FPtrListItem *)f_ptrlist_rend_const(self); + return (FPtrListIterator *)f_ptrlist_rend_const(self); } -const FPtrListItem *f_ptrlist_rend_const(const FPtrList *self) +const FPtrListIterator *f_ptrlist_rend_const(const FPtrList *self) { return NULL; } diff --git a/lib/libpacman/util/fptrlist.h b/lib/libpacman/util/fptrlist.h index e4b6e9d..fa67121 100644 --- a/lib/libpacman/util/fptrlist.h +++ b/lib/libpacman/util/fptrlist.h @@ -38,7 +38,7 @@ typedef struct FCListItem FPtrList; #else typedef struct FCList FPtrList; #endif -typedef struct FCListItem FPtrListItem; +typedef struct FCListItem FPtrListIterator; #else @@ -47,7 +47,7 @@ typedef class FCListItem FPtrList; #else typedef class FCList FPtrList; #endif -typedef class FCListItem FPtrListItem; +typedef class FCListItem FPtrListIterator; namespace flib { @@ -534,20 +534,20 @@ FPtrList *f_ptrlist_add_sorted(FPtrList *list, void *data, _pacman_fn_cmp fn); FPtrList *_pacman_list_remove(FPtrList *haystack, void *needle, _pacman_fn_cmp fn, void **data); FPtrList *_pacman_list_reverse(FPtrList *list); -typedef int (*FPtrListItemComparatorFunc)(const FPtrListItem *item, const void *comparator_data); -typedef void (*FPtrListItemVisitorFunc)(FPtrListItem *item, void *visitor_data); +typedef int (*FPtrListIteratorComparatorFunc)(const FPtrListIterator *item, const void *comparator_data); +typedef void (*FPtrListIteratorVisitorFunc)(FPtrListIterator *item, void *visitor_data); FPtrList *f_list_new(void); -FPtrListItem *f_ptrlistitem_new(void *data); -int f_ptrlistitem_delete(FPtrListItem *self, FVisitor *visitor); +FPtrListIterator *f_ptrlistitem_new(void *data); +int f_ptrlistitem_delete(FPtrListIterator *self, FVisitor *visitor); -void *f_ptrlistitem_data(const FPtrListItem *self); -int f_ptrlistitem_insert_after(FPtrListItem *self, FPtrListItem *previous); -FPtrListItem *f_ptrlistitem_next(FPtrListItem *self); -FPtrListItem *f_ptrlistitem_previous(FPtrListItem *self); +void *f_ptrlistitem_data(const FPtrListIterator *self); +int f_ptrlistitem_insert_after(FPtrListIterator *self, FPtrListIterator *previous); +FPtrListIterator *f_ptrlistitem_next(FPtrListIterator *self); +FPtrListIterator *f_ptrlistitem_previous(FPtrListIterator *self); -int f_ptrlistitem_ptrcmp(const FPtrListItem *item, const void *ptr); +int f_ptrlistitem_ptrcmp(const FPtrListIterator *item, const void *ptr); FPtrList *f_ptrlist_new(void); int f_ptrlist_delete(FPtrList *list, FVisitor *visitor); @@ -558,20 +558,20 @@ int f_ptrlist_fini(FPtrList *self, FVisitor *visitor); #define f_ptrlist_add f_ptrlist_append FPtrList *f_ptrlist_append(FPtrList *list, void *data); int f_ptrlist_clear(FPtrList *list, FVisitor *visitor); -bool f_ptrlist_contains(const FPtrList *list, FPtrListItemComparatorFunc comparator, const void *comparator_data); +bool f_ptrlist_contains(const FPtrList *list, FPtrListIteratorComparatorFunc 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); -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); +FPtrListIterator *f_ptrlist_end(FPtrList *self); +const FPtrListIterator *f_ptrlist_end_const(const FPtrList *self); +FPtrListIterator *f_ptrlist_find(FPtrList *self, FPtrListIteratorComparatorFunc comparator, const void *comparator_data); +const FPtrListIterator *f_ptrlist_find_const(const FPtrList *self, FPtrListIteratorComparatorFunc comparator, const void *comparator_data); +FPtrListIterator *f_ptrlist_first(FPtrList *self); +const FPtrListIterator *f_ptrlist_first_const(const FPtrList *self); +FPtrListIterator *f_ptrlist_last(FPtrList *self); +const FPtrListIterator *f_ptrlist_last_const(const FPtrList *self); +FPtrListIterator *f_ptrlist_rend(FPtrList *self); +const FPtrListIterator *f_ptrlist_rend_const(const FPtrList *self); #ifdef __cplusplus } diff --git a/lib/libpacman/util/stringlist.c b/lib/libpacman/util/stringlist.c index 1f01592..a68f860 100644 --- a/lib/libpacman/util/stringlist.c +++ b/lib/libpacman/util/stringlist.c @@ -84,7 +84,7 @@ struct FVisitor f_stringlistitem_destroyvisitor = { .data = NULL, }; -FStringListItem *f_stringlistitem_new(const char *str) +FStringListIterator *f_stringlistitem_new(const char *str) { #ifndef F_NOCOMPAT return f_ptrlistitem_new(f_strdup(str)); @@ -92,7 +92,7 @@ FStringListItem *f_stringlistitem_new(const char *str) #endif } -int f_stringlistitem_delete(FStringListItem *self) +int f_stringlistitem_delete(FStringListIterator *self) { #ifndef F_NOCOMPAT return f_ptrlistitem_delete(self, &f_stringlistitem_destroyvisitor); @@ -100,7 +100,7 @@ int f_stringlistitem_delete(FStringListItem *self) #endif } -const char *f_stringlistitem_to_str(const FStringListItem *self) +const char *f_stringlistitem_to_str(const FStringListIterator *self) { #ifndef F_NOCOMPAT return f_ptrlistitem_data(self); diff --git a/lib/libpacman/util/stringlist.h b/lib/libpacman/util/stringlist.h index 6db0a06..8b49356 100644 --- a/lib/libpacman/util/stringlist.h +++ b/lib/libpacman/util/stringlist.h @@ -30,16 +30,16 @@ extern "C" { #if 1 typedef FPtrList FStringList; -typedef FPtrListItem FStringListItem; +typedef FPtrListIterator FStringListIterator; #else typedef struct FStringList FStringList; -typedef struct FStringListItem FStringListItem; +typedef struct FStringListIterator FStringListIterator; struct FStringList { FList as_FList; }; -struct FStringListItem { +struct FStringListIterator { FListItem as_FListItem; char to_str[0]; }; @@ -51,10 +51,10 @@ int _pacman_list_is_strin(const char *needle, FStringList *haystack); FStringList *_pacman_list_remove_dupes(FStringList *list); FStringList *_pacman_list_strdup(FStringList *list); -FStringListItem *f_stringlistitem_new(const char *str); -int f_stringlistitem_delete(FStringListItem *self); +FStringListIterator *f_stringlistitem_new(const char *str); +int f_stringlistitem_delete(FStringListIterator *self); -const char *f_stringlistitem_to_str(const FStringListItem *self); +const char *f_stringlistitem_to_str(const FStringListIterator *self); FStringList *f_stringlist_new(void); int f_stringlist_delete(FStringList *self); diff --git a/src/pacman-g2/list.c b/src/pacman-g2/list.c index a0ed139..94b0054 100644 --- a/src/pacman-g2/list.c +++ b/src/pacman-g2/list.c @@ -63,7 +63,7 @@ int list_is_strin(char *needle, list_t *haystack) */ void list_display(const char *title, const FStringList *list) { - const FStringListItem *lp; + const FStringListIterator *lp; int cols, len; len = strlen(title); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
