moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-08-13 17:03:46 -04:00
Code Issues Releases Wiki Activity

checkdeps: remove unnecessary list join and copy

Browse Source 
We can just perform the same search operation on both lists.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-07-03 13:39:13 -05:00
parent 925d74f38d
commit f612e5ede7
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libalpm/deps.c
View File

@ -269,22 +269,20 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_handle_t *handle, alpm_list_t *pkglis
alpm_list_t *remove, alpm_list_t *upgrade, int reversedeps) alpm_list_t *remove, alpm_list_t *upgrade, int reversedeps)
{ {
alpm_list_t *i, *j; alpm_list_t *i, *j;
alpm_list_t *targets, *dblist = NULL, *modified = NULL; alpm_list_t *dblist = NULL, *modified = NULL;
alpm_list_t *baddeps = NULL; alpm_list_t *baddeps = NULL;
int nodepversion; int nodepversion;
CHECK_HANDLE(handle, return NULL); CHECK_HANDLE(handle, return NULL);
targets = alpm_list_join(alpm_list_copy(remove), alpm_list_copy(upgrade));
for(i = pkglist; i; i = i->next) { for(i = pkglist; i; i = i->next) {
alpm_pkg_t *pkg = i->data; alpm_pkg_t *pkg = i->data;
if(_alpm_pkg_find(targets, pkg->name)) { if(_alpm_pkg_find(remove, pkg->name) || _alpm_pkg_find(upgrade, pkg->name)) {
modified = alpm_list_add(modified, pkg); modified = alpm_list_add(modified, pkg);
} else { } else {
dblist = alpm_list_add(dblist, pkg); dblist = alpm_list_add(dblist, pkg);
} }
} }
alpm_list_free(targets);
nodepversion = no_dep_version(handle); nodepversion = no_dep_version(handle);