diff options
| author | Allan McRae <allan@archlinux.org> | 2010-12-08 06:13:36 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-01-08 04:15:46 +0100 |
| commit | f966f3a8344cd96bd675c79a5c470c66920b890c (patch) | |
| tree | c97116b7cc0ca1dca8bed3f050ab18dc28a05585 /lib/libalpm/remove.c | |
| parent | 4bc6ed56aa48784c8caf56c3a6fb1a3c972d221c (diff) | |
| download | pacman-f966f3a8344cd96bd675c79a5c470c66920b890c.tar.gz pacman-f966f3a8344cd96bd675c79a5c470c66920b890c.tar.xz | |
Use size_t for alpm_list sizes
There is a lot of swtiching between size_t and int for alpm_list sizes
in the codebase. Start converting these to all be size_t by adjusting
the return type of alpm_list_count and fixing all additional warnings
given by -Wconversion that are generated by this change.
Dan: a few more small changes to ensure things compile, adjusting some
printf format string characters to accommodate the larger size on x86_64.
Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/remove.c')
| -rw-r--r-- | lib/libalpm/remove.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index be349977..bcc8dc45 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -369,7 +369,7 @@ int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db) { pmpkg_t *info; alpm_list_t *targ, *lp; - int pkg_count; + size_t pkg_count; ALPM_LOG_FUNC; @@ -383,7 +383,7 @@ int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db) char scriptlet[PATH_MAX]; info = (pmpkg_t*)targ->data; const char *pkgname = NULL; - int targcount = alpm_list_count(targ); + size_t targcount = alpm_list_count(targ); if(handle->trans->state == STATE_INTERRUPTED) { return(0); @@ -414,9 +414,9 @@ int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db) } } - int filenum = alpm_list_count(files); + size_t filenum = alpm_list_count(files); alpm_list_t *newfiles; - _alpm_log(PM_LOG_DEBUG, "removing %d files\n", filenum); + _alpm_log(PM_LOG_DEBUG, "removing %ld files\n", (unsigned long)filenum); /* init progress bar */ PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, info->name, 0, |