summaryrefslogtreecommitdiffstats
path: root/lib/libalpm/deps.c
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-01-30 04:46:33 +0100
committerDan McGee <dan@archlinux.org>2007-01-30 04:46:33 +0100
commit1799afc9c144381150e181cee3a03a506b3e1d31 (patch)
tree5bfad94c39c4766a0b73b87b31924a58dae2d684 /lib/libalpm/deps.c
parent358a4a62f325c0f043005cff72d79b813d2a318f (diff)
downloadpacman-1799afc9c144381150e181cee3a03a506b3e1d31.tar.gz
pacman-1799afc9c144381150e181cee3a03a506b3e1d31.tar.xz
Discussed on IRC for a bit, this makes the following changes for clarity:
* alpm_list_is_in --> alpm_list_find * alpm_list_is_strin --> alpm_list_find_str * Flip parameters of both functions to be inline with rest of alpm_list. First commit, woohoo.
Diffstat (limited to 'lib/libalpm/deps.c')
-rw-r--r--lib/libalpm/deps.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c
index 607dd673..0b4af443 100644
--- a/lib/libalpm/deps.c
+++ b/lib/libalpm/deps.c
@@ -363,7 +363,7 @@ alpm_list_t *_alpm_checkdeps(pmtrans_t *trans, pmdb_t *db, pmtranstype_t op,
spkg = k->data;
}
if(spkg) {
- if(alpm_list_is_strin(tp->name, spkg->provides)) {
+ if(alpm_list_find_str(spkg->provides, tp->name)) {
found = 1;
}
}
@@ -549,7 +549,7 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg,
/* check if one of the packages in *list already provides this dependency */
for(j = list; j && !found; j = j->next) {
pmpkg_t *sp = (pmpkg_t *)j->data;
- if(alpm_list_is_strin(miss->depend.name, sp->provides)) {
+ if(alpm_list_find_str(sp->provides, miss->depend.name)) {
_alpm_log(PM_LOG_DEBUG, _("%s provides dependency %s -- skipping"),
sp->name, miss->depend.name);
found = 1;
@@ -602,7 +602,7 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg,
* something we're not supposed to.
*/
int usedep = 1;
- if(alpm_list_is_strin(sync->name, handle->ignorepkg)) {
+ if(alpm_list_find_str(handle->ignorepkg, sync->name)) {
pmpkg_t *dummypkg = _alpm_pkg_new(miss->target, NULL);
QUESTION(trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, dummypkg, sync, NULL, &usedep);
FREEPKG(dummypkg);