Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=254126d444bb5919fc9debe62a27c6899245e6e9
commit 254126d444bb5919fc9debe62a27c6899245e6e9 Author: Michel Hermier <[email protected]> Date: Mon Aug 18 16:14:52 2014 +0200 libpacman: Prune some f_list_* initialisers/finalisers. diff --git a/lib/libpacman/util/fptrlist.c b/lib/libpacman/util/fptrlist.c index f28d2f9..16317c1 100644 --- a/lib/libpacman/util/fptrlist.c +++ b/lib/libpacman/util/fptrlist.c @@ -180,30 +180,11 @@ FPtrList *f_list_new() ASSERT((self = f_zalloc(sizeof(*self))) != NULL, return NULL); - f_list_init(self); + f_ptrlist_init(self); return self; #endif } -int f_list_delete(FPtrList *self, FVisitor *visitor) -{ - return f_list_fini(self, visitor); -} - -int f_list_init(FPtrList *self) -{ - ASSERT(self != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); - - return 0; -} - -int f_list_fini(FPtrList *self, FVisitor *visitor) -{ - ASSERT(self != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); - - return f_list_clear(self, visitor); -} - int f_list_append(FPtrList *self, FPtrListItem *item) { return f_listitem_insert_after(item, f_ptrlist_last(self)); @@ -217,11 +198,6 @@ int f_list_append_unique(FPtrList *self, FPtrListItem *item, FPtrListItemCompara return -1; } -int f_list_clear(FPtrList *self, FVisitor *visitor) -{ - return -1; -} - int f_list_contains(const FPtrList *list, FPtrListItemComparatorFunc comparator, const void *comparator_data) { return f_list_find_const(list, comparator, comparator_data) != NULL; @@ -319,7 +295,9 @@ int f_ptrlist_delete(FPtrList *self, FVisitor *visitor) int f_ptrlist_init(FPtrList *self) { - return f_list_init(self); + ASSERT(self != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); + + return 0; } int f_ptrlist_fini(FPtrList *self, FVisitor *visitor) diff --git a/lib/libpacman/util/fptrlist.h b/lib/libpacman/util/fptrlist.h index 3247181..1ad223e 100644 --- a/lib/libpacman/util/fptrlist.h +++ b/lib/libpacman/util/fptrlist.h @@ -78,15 +78,10 @@ FPtrListItem *f_listitem_next(FPtrListItem *self); FPtrListItem *f_listitem_previous(FPtrListItem *self); FPtrList *f_list_new(void); -int f_list_delete(FPtrList *self, FVisitor *visitor); - -int f_list_init(FPtrList *self); -int f_list_fini(FPtrList *self, FVisitor *visitor); #define f_list_add f_list_append int f_list_append(FPtrList *self, FPtrListItem *item); int f_list_append_unique(FPtrList *self, FPtrListItem *item, FPtrListItemComparatorFunc comparator); -int f_list_clear(FPtrList *self, FVisitor *visitor); 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); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
