Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=7f529d2ba31368d35f807906347607ae5177b375
commit 7f529d2ba31368d35f807906347607ae5177b375 Author: Michel Hermier <[email protected]> Date: Tue Sep 23 18:39:16 2014 +0200 libpacman: Simplify pmtrans_t::sortbydeps call interaface. diff --git a/lib/libpacman/deps.cpp b/lib/libpacman/deps.cpp index 6ee919a..1090ee9 100644 --- a/lib/libpacman/deps.cpp +++ b/lib/libpacman/deps.cpp @@ -115,18 +115,15 @@ FPtrList &_pacman_depmisslist_add(FPtrList &misslist, pmdepmissing_t *miss) * This function returns the new FPtrList* target list. * */ -FList<Package *> pmtrans_t::sortbydeps() -{ - return sortbydeps(packages(), PM_TRANS_TYPE_ADD); -} - -FList<Package *> pmtrans_t::sortbydeps(const FList<Package *> &targets, int mode) +FList<Package *> pmtrans_t::sortbydeps(int mode) { FList<Package *> newtargs; FPtrList vertices; pmgraph_t *vertex; int found; + const FList<Package *> &targets = packages(); + if(targets.empty()) { return newtargs; } diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index be9c48d..1c02f64 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -863,7 +863,7 @@ cleanup: } /* re-order w.r.t. dependencies */ _pacman_log(PM_LOG_FLOW1, _("sorting by dependencies")); - m_packages = sortbydeps(packages(), m_type & PM_TRANS_TYPE_ADD ? PM_TRANS_TYPE_ADD : PM_TRANS_TYPE_REMOVE); + m_packages = sortbydeps(m_type & PM_TRANS_TYPE_ADD ? PM_TRANS_TYPE_ADD : PM_TRANS_TYPE_REMOVE); EVENT(this, PM_TRANS_EVT_CHECKDEPS_DONE, NULL, NULL); } diff --git a/lib/libpacman/trans.h b/lib/libpacman/trans.h index 38e5082..1df39bb 100644 --- a/lib/libpacman/trans.h +++ b/lib/libpacman/trans.h @@ -73,8 +73,7 @@ struct __pmtrans_t FPtrList find_conflicts(); void removedeps(); int resolvedeps(FPtrList **data); - FList<libpacman::Package *> sortbydeps(); - FList<libpacman::Package *> sortbydeps(const FList<libpacman::Package *> &targets, int mode); + FList<libpacman::Package *> sortbydeps(int mode = PM_TRANS_TYPE_ADD); /* Compatibility */ FList<libpacman::Package *> packages() const; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
