Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=8754704f8cf4dd3b71225faf70ed5d9b5ab2dc3a
commit 8754704f8cf4dd3b71225faf70ed5d9b5ab2dc3a Author: Michel Hermier <[email protected]> Date: Mon Aug 18 19:52:51 2014 +0200 libpacman: Prune f_listitem_delete. diff --git a/lib/libpacman/util/fptrlist.c b/lib/libpacman/util/fptrlist.c index b8fe272..6682e2c 100644 --- a/lib/libpacman/util/fptrlist.c +++ b/lib/libpacman/util/fptrlist.c @@ -130,15 +130,6 @@ FPtrList *_pacman_list_reverse(FPtrList *list) return(newlist); } -int f_listitem_delete(FPtrListItem *self, FVisitor *visitor) -{ - ASSERT(self != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); - - f_visit(self, visitor); - free(self); - return 0; -} - FPtrList *f_list_new() { #ifndef F_NOCOMPAT @@ -219,7 +210,9 @@ int f_ptrlistitem_delete(FPtrListItem *self, FVisitor *visitor) { ASSERT(self != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); - return f_listitem_delete(self, visitor); + f_visit(self, visitor); + free(self); + return 0; } void *f_ptrlistitem_data(const FPtrListItem *self) diff --git a/lib/libpacman/util/fptrlist.h b/lib/libpacman/util/fptrlist.h index d6f9139..7345242 100644 --- a/lib/libpacman/util/fptrlist.h +++ b/lib/libpacman/util/fptrlist.h @@ -71,8 +71,6 @@ FPtrList *_pacman_list_reverse(FPtrList *list); typedef int (*FPtrListItemComparatorFunc)(const FPtrListItem *item, const void *comparator_data); typedef void (*FPtrListItemVisitorFunc)(FPtrListItem *item, void *visitor_data); -int f_listitem_delete(FPtrListItem *self, FVisitor *visitor); - FPtrList *f_list_new(void); int f_list_contains(const FPtrList *list, FPtrListItemComparatorFunc comparator, const void *comparator_data); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
