Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=d410f83ee33528031b93418652f2b88df5ca6dee
commit d410f83ee33528031b93418652f2b88df5ca6dee Author: Michel Hermier <[email protected]> Date: Fri Sep 26 12:01:13 2014 +0200 libpacman: Use FStringList::contains where possible. diff --git a/lib/libpacman/cache.cpp b/lib/libpacman/cache.cpp index 3d85465..60ca2f5 100644 --- a/lib/libpacman/cache.cpp +++ b/lib/libpacman/cache.cpp @@ -184,7 +184,7 @@ int _pacman_db_load_grpcache(Database *db) grp = new Group(grp_name); db->grpcache.add_sorted(grp, _pacman_grp_cmp); } - if(!_pacman_list_is_strin(pkg->name(), &grp->packages)) { + if(!grp->packages.contains(pkg->name())) { grp->packages.add_sorted(pkg->name(), strcmp); } } diff --git a/lib/libpacman/conflict.cpp b/lib/libpacman/conflict.cpp index 7f1f3a6..b7e9daf 100644 --- a/lib/libpacman/conflict.cpp +++ b/lib/libpacman/conflict.cpp @@ -297,7 +297,7 @@ FPtrList pmtrans_t::find_conflicts() _pacman_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), dbpkg->name()); dbpkg->read(INFRQ_FILES); } - if(dbpkg && _pacman_list_is_strin(filestr, &dbpkg->files())) { + if(dbpkg && dbpkg->files().contains(filestr)) { ok = 1; } /* Check if the conflicting file has been moved to another package/target */ @@ -314,7 +314,7 @@ FPtrList pmtrans_t::find_conflicts() dbpkg2->read(INFRQ_FILES); } /* If it used to exist in there, but doesn't anymore */ - if(dbpkg2 && !_pacman_list_is_strin(filestr, &p2->files()) && _pacman_list_is_strin(filestr, &dbpkg2->files())) { + if(dbpkg2 && !p2->files().contains(filestr) && dbpkg2->files().contains(filestr)) { ok = 1; /* Add to the "skip list" of files that we shouldn't remove during an upgrade. * diff --git a/lib/libpacman/db/localdb.cpp b/lib/libpacman/db/localdb.cpp index 69b5b9d..6884730 100644 --- a/lib/libpacman/db/localdb.cpp +++ b/lib/libpacman/db/localdb.cpp @@ -157,7 +157,7 @@ int _pacman_localpackage_remove(Package *pkg, pmtrans_t *trans, int howmany, int FREE(hash_orig); if(!nb && trans->m_type == PM_TRANS_TYPE_UPGRADE) { /* check noupgrade */ - if(_pacman_list_is_strin(file, &handle->noupgrade)) { + if(handle->noupgrade.contains(file)) { nb = 1; } } diff --git a/lib/libpacman/deps.cpp b/lib/libpacman/deps.cpp index 466bc91..5cbf825 100644 --- a/lib/libpacman/deps.cpp +++ b/lib/libpacman/deps.cpp @@ -496,7 +496,7 @@ int pmtrans_t::resolvedeps(FPtrList **data) * something we're not supposed to. */ int usedep = 1; - if(_pacman_list_is_strin(ps->name(), &handle->ignorepkg)) { + if(handle->ignorepkg.contains(ps->name())) { Package *dummypkg = new Package(miss->target, NULL); QUESTION(this, PM_TRANS_CONV_INSTALL_IGNOREPKG, dummypkg, ps, NULL, &usedep); dummypkg->release(); diff --git a/lib/libpacman/package.cpp b/lib/libpacman/package.cpp index 59216e2..04b4455 100644 --- a/lib/libpacman/package.cpp +++ b/lib/libpacman/package.cpp @@ -290,7 +290,7 @@ const FStringList &Package::provides() const bool Package::provides(const char *pkgname) { - return _pacman_list_is_strin(pkgname, &provides()); + return provides().contains(pkgname); } const FStringList &Package::replaces() const @@ -300,7 +300,7 @@ const FStringList &Package::replaces() const bool Package::replaces(const char *pkgname) { - return _pacman_list_is_strin(pkgname, &replaces()); + return replaces().contains(pkgname); } bool Package::match(const pmdepend_t &depend) diff --git a/lib/libpacman/package/packagecache.cpp b/lib/libpacman/package/packagecache.cpp index b23557a..c3059bb 100644 --- a/lib/libpacman/package/packagecache.cpp +++ b/lib/libpacman/package/packagecache.cpp @@ -88,7 +88,7 @@ int _pacman_packagecache_clean(int level) } if(!strcmp(name, n)) { const char *ptr = (pacman_pkg_vercmp(version, v) < 0) ? str : s; - if(!_pacman_list_is_strin(ptr, &clean)) { + if(!clean.contains(ptr)) { clean.add(ptr); } } diff --git a/lib/libpacman/server.cpp b/lib/libpacman/server.cpp index efd942f..0954ec2 100644 --- a/lib/libpacman/server.cpp +++ b/lib/libpacman/server.cpp @@ -395,7 +395,7 @@ int _pacman_downloadfiles_forreal(Handle *handle, const FPtrList &servers, const for(auto lp = files.begin(), end = files.end(); lp != end; ++lp) { const char *fn = *lp; - if(_pacman_list_is_strin(fn, &complete)) { + if(complete.contains(fn)) { continue; } diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index 956b0b2..2400da9 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -273,7 +273,7 @@ int __pmtrans_t::add(const char *target, pmtranstype_t type, int flags, pmsyncpk ASSERT((db_local = m_handle->db_local) != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(!_pacman_strempty(target), RET_ERR(PM_ERR_WRONG_ARGS, -1)); - if(_pacman_list_is_strin(target, &targets)) { + if(targets.contains(target)) { RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1); } targets.add(target); @@ -416,7 +416,7 @@ int __pmtrans_t::add(const char *target, pmtranstype_t type, int flags, pmsyncpk } /* ignore holdpkgs on upgrade */ - if((this == m_handle->trans) && _pacman_list_is_strin(pkg_local->name(), &m_handle->holdpkg)) { + if((this == m_handle->trans) && m_handle->holdpkg.contains(pkg_local->name())) { int resp = 0; QUESTION(this, PM_TRANS_CONV_REMOVE_HOLDPKG, pkg_local, NULL, NULL, &resp); if(!resp) { @@ -584,8 +584,8 @@ int __pmtrans_t::prepare(FPtrList **data) /* figure out which one was requested in targets. If they both were, * then it's still an unresolvable conflict. */ - target = _pacman_list_is_strin(miss->target, &targets); - depend = _pacman_list_is_strin(miss->depend.name, &targets); + target = targets.contains(miss->target); + depend = targets.contains(miss->depend.name); if(depend && !target) { _pacman_log(PM_LOG_DEBUG, _("'%s' is in the target list -- keeping it"), miss->depend.name); @@ -617,7 +617,7 @@ int __pmtrans_t::prepare(FPtrList **data) _pacman_log(PM_LOG_DEBUG, _("resolving package '%s' conflict"), miss->target); if(local) { int doremove = 0; - if(!_pacman_list_is_strin(miss->depend.name, &asked)) { + if(!asked.contains(miss->depend.name)) { QUESTION(this, PM_TRANS_CONV_CONFLICT_PKG, miss->target, miss->depend.name, NULL, &doremove); asked.add(miss->depend.name); if(doremove) { @@ -978,7 +978,7 @@ int _pacman_fpmpackage_install(Package *pkg, pmtranstype_t type, pmtrans_t *tran * eg, /home/httpd/html/index.html may be removed so index.php * could be used. */ - if(_pacman_list_is_strin(pathname, &handle->noextract)) { + if(handle->noextract.contains(pathname)) { pacman_logaction(_("notice: %s is in NoExtract -- skipping extraction"), pathname); archive_read_data_skip (archive); continue; @@ -989,11 +989,11 @@ int _pacman_fpmpackage_install(Package *pkg, pmtranstype_t type, pmtrans_t *tran if(S_ISLNK(buf.st_mode)) { continue; } else if(!S_ISDIR(buf.st_mode)) { - if(_pacman_list_is_strin(pathname, &handle->noupgrade)) { + if(handle->noupgrade.contains(pathname)) { notouch = 1; } else { if(type == PM_TRANS_TYPE_ADD || oldpkg == NULL) { - nb = _pacman_list_is_strin(pathname, &pkg->backup()); + nb = pkg->backup().contains(pathname); } else { /* op == PM_TRANS_TYPE_UPGRADE */ hash_orig = oldpkg->fileneedbackup(pathname); @@ -1278,13 +1278,6 @@ out: return retval; } -/* Helper function for comparing strings - */ -static int str_cmp(const void *s1, const void *s2) -{ - return(strcmp((const char *)s1, (const char *)s2)); -} - static const struct trans_event_table_item { struct { @@ -1530,7 +1523,7 @@ int __pmtrans_t::commit(FPtrList **data) /* merge lists */ auto &requiredby = old->requiredby(); for(auto k = requiredby.begin(), end = requiredby.end(); k != end; ++k) { - if(!_pacman_list_is_strin(*k, &pkg_new->requiredby())) { + if(!pkg_new->requiredby().contains(*k)) { /* replace old's name with new's name in the requiredby's dependency list */ Package *depender = db_local->find(*k); if(depender == NULL) { diff --git a/lib/libpacman/trans_sysupgrade.cpp b/lib/libpacman/trans_sysupgrade.cpp index f74fd1c..e795f61 100644 --- a/lib/libpacman/trans_sysupgrade.cpp +++ b/lib/libpacman/trans_sysupgrade.cpp @@ -93,7 +93,7 @@ int _pacman_trans_sysupgrade(pmtrans_t *trans) Package *lpkg = *m; if(!strcmp((const char *)*k, lpkg->name())) { _pacman_log(PM_LOG_DEBUG, _("checking replacement '%s' for package '%s'"), (const char *)*k, spkg->name()); - if(_pacman_list_is_strin(lpkg->name(), &handle->ignorepkg)) { + if(handle->ignorepkg.contains(lpkg->name())) { _pacman_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (to be replaced by %s-%s)"), lpkg->name(), lpkg->version(), spkg->name(), spkg->version()); } else { @@ -169,7 +169,7 @@ int _pacman_trans_sysupgrade(pmtrans_t *trans) local->name(), local->version()); } else if(cmp == 0) { /* versions are identical */ - } else if(_pacman_list_is_strin(local->name(), &handle->ignorepkg)) { + } else if(handle->ignorepkg.contains(local->name())) { /* package should be ignored (IgnorePkg) */ _pacman_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"), local->name(), local->version(), spkg->version()); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
