diff options
| author | Dan McGee <dan@archlinux.org> | 2007-01-30 04:46:33 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-01-30 04:46:33 +0100 |
| commit | 1799afc9c144381150e181cee3a03a506b3e1d31 (patch) | |
| tree | 5bfad94c39c4766a0b73b87b31924a58dae2d684 /lib/libalpm/remove.c | |
| parent | 358a4a62f325c0f043005cff72d79b813d2a318f (diff) | |
| download | pacman-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/remove.c')
| -rw-r--r-- | lib/libalpm/remove.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 9896453f..8621db79 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -78,7 +78,8 @@ int _alpm_remove_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name) } /* ignore holdpkgs on upgrade */ - if((trans == handle->trans) && alpm_list_is_strin(info->name, handle->holdpkg)) { + if((trans == handle->trans) + && alpm_list_find_str(handle->holdpkg, info->name)) { int resp = 0; QUESTION(trans, PM_TRANS_CONV_REMOVE_HOLDPKG, info, NULL, NULL, &resp); if(!resp) { @@ -177,7 +178,7 @@ static void unlink_file(pmpkg_t *info, alpm_list_t *lp, alpm_list_t *targ, FREE(checksum); } if ( !nb && trans->type == PM_TRANS_TYPE_UPGRADE ) { /* check noupgrade */ - if ( alpm_list_is_strin(file, handle->noupgrade) ) { + if ( alpm_list_find_str(handle->noupgrade, file) ) { nb = 1; } } |