From d199269813180d4a034fea54d025280aef3e4853 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba@bibl.u-szeged.hu> Date: Fri, 4 Jul 2008 15:39:26 +0200 Subject: [PATCH] New _alpm_find_dep_satisfier function This function finds the first satisfier package in a pkglist. Using it instead of _alpm_find_dep_satisfiers eliminates some memleaks and it is faster. (_alpm_find_dep_satisfiers and _alpm_find_pkg_satisfiers will be removed soon.) Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> --- lib/libalpm/deps.c | 25 +++++++++++++++++++------ lib/libalpm/deps.h | 1 + 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 410e22d..e67b008 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -189,6 +189,19 @@ alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, int reverse) return(newtargs); } +pmpkg_t *_alpm_find_dep_satisfier(alpm_list_t *pkgs, pmdepend_t *dep) +{ + alpm_list_t *i; + + for(i = pkgs; i; i = alpm_list_next(i)) { + pmpkg_t *pkg = i->data; + if(alpm_depcmp(pkg, dep)) { + return(pkg); + } + } + return(NULL); +} + alpm_list_t *_alpm_find_dep_satisfiers(alpm_list_t *pkgs, pmdepend_t *dep) { alpm_list_t *i, *ret = NULL; @@ -232,7 +245,7 @@ alpm_list_t SYMEXPORT *alpm_deptest(pmdb_t *db, alpm_list_t *targets) target = alpm_list_getdata(i); dep = _alpm_splitdep(target); - if(!_alpm_find_dep_satisfiers(_alpm_db_get_pkgcache(db), dep)) { + if(!_alpm_find_dep_satisfier(_alpm_db_get_pkgcache(db), dep)) { ret = alpm_list_add(ret, target); } _alpm_dep_free(dep); @@ -283,8 +296,8 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(pmdb_t *db, int reversedeps, pmdepend_t *depend = j->data; /* 1. we check the upgrade list */ /* 2. we check database for untouched satisfying packages */ - if(!_alpm_find_dep_satisfiers(upgrade, depend) && - !_alpm_find_dep_satisfiers(dblist, depend)) { + if(!_alpm_find_dep_satisfier(upgrade, depend) && + !_alpm_find_dep_satisfier(dblist, depend)) { /* Unsatisfied dependency in the upgrade list */ char *missdepstring = alpm_dep_get_string(depend); _alpm_log(PM_LOG_DEBUG, "checkdeps: missing dependency '%s' for package '%s'\n", @@ -303,13 +316,13 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(pmdb_t *db, int reversedeps, pmpkg_t *lp = i->data; for(j = alpm_pkg_get_depends(lp); j; j = j->next) { pmdepend_t *depend = j->data; - pmpkg_t *causingpkg = alpm_list_getdata(_alpm_find_dep_satisfiers(modified, depend)); + pmpkg_t *causingpkg = _alpm_find_dep_satisfier(modified, depend); /* we won't break this depend, if it is already broken, we ignore it */ /* 1. check upgrade list for satisfiers */ /* 2. check dblist for satisfiers */ if(causingpkg && - !_alpm_find_dep_satisfiers(upgrade, depend) && - !_alpm_find_dep_satisfiers(dblist, depend)) { + !_alpm_find_dep_satisfier(upgrade, depend) && + !_alpm_find_dep_satisfier(dblist, depend)) { char *missdepstring = alpm_dep_get_string(depend); _alpm_log(PM_LOG_DEBUG, "checkdeps: transaction would break '%s' dependency of '%s'\n", missdepstring, alpm_pkg_get_name(lp)); diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index 7bf178d..1e539b7 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -52,6 +52,7 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg, **data); int _alpm_dep_edge(pmpkg_t *pkg1, pmpkg_t *pkg2); pmdepend_t *_alpm_splitdep(const char *depstring); +pmpkg_t *_alpm_find_dep_satisfier(alpm_list_t *pkgs, pmdepend_t *dep); alpm_list_t *_alpm_find_dep_satisfiers(alpm_list_t *pkgs, pmdepend_t *dep); #endif /* _ALPM_DEPS_H */ -- 1.5.6.1