Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=0fd68c30a339e6e6a4e6928212754ac19148cc94
commit 0fd68c30a339e6e6a4e6928212754ac19148cc94 Author: Michel Hermier <[email protected]> Date: Tue Aug 26 10:20:52 2014 +0200 libpacman: Drop appartenance check in pacman_db_update, drop f_ptrlist_* functions associed. diff --git a/lib/libpacman/pacman.cpp b/lib/libpacman/pacman.cpp index a5bb290..22ada08 100644 --- a/lib/libpacman/pacman.cpp +++ b/lib/libpacman/pacman.cpp @@ -535,9 +535,6 @@ int pacman_db_update(int force, pmdb_t *_db) if(handle->lock() != 0) { return -1; } - if(!f_ptrlist_contains_ptr(handle->dbs_sync, db)) { - RET_ERR(PM_ERR_DB_NOT_FOUND, -1); - } status = _pacman_syncdb_update(db, force); if(handle->unlock() != 0) { diff --git a/lib/libpacman/util/fptrlist.cpp b/lib/libpacman/util/fptrlist.cpp index 44f839f..d33b748 100644 --- a/lib/libpacman/util/fptrlist.cpp +++ b/lib/libpacman/util/fptrlist.cpp @@ -288,16 +288,6 @@ int f_ptrlist_clear(FPtrList *list, FVisitor *visitor) return 0; } -bool f_ptrlist_contains(const FPtrList *list, FPtrListIteratorComparatorFunc comparator, const void *comparator_data) -{ - return f_ptrlist_find_const(list, comparator, comparator_data) != NULL; -} - -bool f_ptrlist_contains_ptr(const FPtrList *list, const void *ptr) -{ - return f_ptrlist_contains(list, f_ptrlistitem_ptrcmp, ptr); -} - int f_ptrlist_count(const FPtrList *self) { #ifndef F_NOCOMPAT @@ -329,21 +319,6 @@ const FPtrListIterator *f_ptrlist_end_const(const FPtrList *self) return NULL; } -FPtrListIterator *f_ptrlist_find(FPtrList *self, FPtrListIteratorComparatorFunc comparator, const void *comparator_data) -{ - return (FPtrListIterator *)f_ptrlist_find_const(self, comparator, 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) { - return it; - } - } - return NULL; -} - FPtrListIterator *f_ptrlist_first(FPtrList *self) { return (FPtrListIterator *)f_ptrlist_first_const(self); diff --git a/lib/libpacman/util/fptrlist.h b/lib/libpacman/util/fptrlist.h index 290bb75..59dfdfe 100644 --- a/lib/libpacman/util/fptrlist.h +++ b/lib/libpacman/util/fptrlist.h @@ -581,7 +581,6 @@ 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 (*FPtrListIteratorComparatorFunc)(const FPtrListIterator *item, const void *comparator_data); typedef void (*FPtrListIteratorVisitorFunc)(FPtrListIterator *item, void *visitor_data); FPtrList *f_list_new(void); @@ -602,14 +601,10 @@ int f_ptrlist_delete(FPtrList *list, 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, 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); 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); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
