Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=7ef04fd667b777c5d59d66032c18c3ca8a5a607b
commit 7ef04fd667b777c5d59d66032c18c3ca8a5a607b Author: Michel Hermier <[email protected]> Date: Wed Sep 17 08:18:54 2014 +0200 libpacman: Remove some unecessary code. diff --git a/lib/libpacman/cache.cpp b/lib/libpacman/cache.cpp index 39682a2..3d85465 100644 --- a/lib/libpacman/cache.cpp +++ b/lib/libpacman/cache.cpp @@ -195,14 +195,9 @@ int _pacman_db_load_grpcache(Database *db) int _pacman_db_clear_grpcache(Database *db) { - FVisitor visitor = { - .fn = (FVisitorFunc)_pacman_grp_delete, - .data = NULL, - }; - ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); - db->grpcache.clear(/* &visitor */); + db->grpcache.clear(); return 0; } diff --git a/lib/libpacman/group.cpp b/lib/libpacman/group.cpp index 7099518..7c169ba 100644 --- a/lib/libpacman/group.cpp +++ b/lib/libpacman/group.cpp @@ -40,11 +40,6 @@ Group::Group(const char *name) Group::~Group() { } -void _pacman_grp_delete(Group *grp) -{ - delete (grp); -} - /* Helper function for sorting groups */ int _pacman_grp_cmp(const void *g1, const void *g2) diff --git a/lib/libpacman/group.h b/lib/libpacman/group.h index f80b55f..173e620 100644 --- a/lib/libpacman/group.h +++ b/lib/libpacman/group.h @@ -44,7 +44,6 @@ public: } -void _pacman_grp_delete(libpacman::Group *group); int _pacman_grp_cmp(const void *g1, const void *g2); #endif /* _PACMAN_GROUP_H */ diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index b8fbf46..9853903 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -262,15 +262,6 @@ pmsyncpkg_t *__pmtrans_t::add(pmsyncpkg_t *syncpkg, int flags) return syncpkg; } -int __pmtrans_t::add(Package *pkg, pmtranstype_t type, int flags) -{ - ASSERT(pkg != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); - - _pacman_log(PM_LOG_FLOW2, _("adding %s in the targets list"), pkg->name()); - packages.add(pkg); - return 0; -} - static Package *_pacman_filedb_load(Database *db, const char *name) { diff --git a/lib/libpacman/trans.h b/lib/libpacman/trans.h index 0baa661..738e501 100644 --- a/lib/libpacman/trans.h +++ b/lib/libpacman/trans.h @@ -65,7 +65,6 @@ struct __pmtrans_t int commit(FPtrList **data); pmsyncpkg_t *add(pmsyncpkg_t *syncpkg, int flags); - int add(libpacman::Package *pkg, pmtranstype_t type, int flags); int add(const char *target, pmtranstype_t type, int flags); /* Capacity */ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
