moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-03-01 01:41:52 -05:00
Code Issues Releases Wiki Activity

Remove two alpm_list_count usages

Browse Source 
We have just looped through the list of files, so might as well get
the count as we go.

Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Allan McRae 2011-06-25 08:28:28 +10:00 committed by Dan McGee
parent 93c77565f6
commit 6a413fe72f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/libalpm/remove.c
View File

@ -287,7 +287,7 @@ int _alpm_upgraderemove_package(pmhandle_t *handle,
{ {
alpm_list_t *skip_remove, *b; alpm_list_t *skip_remove, *b;
alpm_list_t *newfiles, *lp; alpm_list_t *newfiles, *lp;
size_t filenum; size_t filenum = 0;
alpm_list_t *files = alpm_pkg_get_files(oldpkg); alpm_list_t *files = alpm_pkg_get_files(oldpkg);
const char *pkgname = alpm_pkg_get_name(oldpkg); const char *pkgname = alpm_pkg_get_name(oldpkg);
@ -323,9 +323,9 @@ int _alpm_upgraderemove_package(pmhandle_t *handle,
"not removing package '%s', can't remove all files\n", pkgname); "not removing package '%s', can't remove all files\n", pkgname);
RET_ERR(handle, PM_ERR_PKG_CANT_REMOVE, -1); RET_ERR(handle, PM_ERR_PKG_CANT_REMOVE, -1);
} }
filenum++;
} }
filenum = alpm_list_count(files);
_alpm_log(handle, PM_LOG_DEBUG, "removing %ld files\n", (unsigned long)filenum); _alpm_log(handle, PM_LOG_DEBUG, "removing %ld files\n", (unsigned long)filenum);
/* iterate through the list backwards, unlinking files */ /* iterate through the list backwards, unlinking files */
@ -391,7 +391,7 @@ int _alpm_remove_packages(pmhandle_t *handle)
if(!(trans->flags & PM_TRANS_FLAG_DBONLY)) { if(!(trans->flags & PM_TRANS_FLAG_DBONLY)) {
alpm_list_t *files = alpm_pkg_get_files(info); alpm_list_t *files = alpm_pkg_get_files(info);
alpm_list_t *newfiles; alpm_list_t *newfiles;
size_t filenum; size_t filenum = 0;
for(lp = files; lp; lp = lp->next) { for(lp = files; lp; lp = lp->next) {
if(!can_remove_file(handle, lp->data, NULL)) { if(!can_remove_file(handle, lp->data, NULL)) {
@ -399,9 +399,9 @@ int _alpm_remove_packages(pmhandle_t *handle)
pkgname); pkgname);
RET_ERR(handle, PM_ERR_PKG_CANT_REMOVE, -1); RET_ERR(handle, PM_ERR_PKG_CANT_REMOVE, -1);
} }
filenum++;
} }
filenum = alpm_list_count(files);
_alpm_log(handle, PM_LOG_DEBUG, "removing %ld files\n", (unsigned long)filenum); _alpm_log(handle, PM_LOG_DEBUG, "removing %ld files\n", (unsigned long)filenum);
/* init progress bar */ /* init progress bar */