diff options
| author | Dan McGee <dan@archlinux.org> | 2012-04-08 22:32:49 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-04-08 22:32:49 -0500 |
| commit | c27a9467692616900189fce43cd18d14bbda7929 (patch) | |
| tree | 5f81c1af9345583489149e360c15aa1394e50678 | |
| parent | d158dde30c378acc8e88d5208aa837f92331af9e (diff) | |
Fix a signed overflow error on i686 with GCC 4.7.0
Not sure why this one wasn't showing up on x86_64, but this fixes the
compile on i686.
diskspace.c: In function 'calculate_removed_size':
diskspace.c:247:4: error: assuming signed overflow does not occur when negating a division [-Werror=strict-overflow]
cc1: all warnings being treated as errors
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | lib/libalpm/diskspace.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index ac7dab00..daee2447 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -224,6 +224,7 @@ static int calculate_removed_size(alpm_handle_t *handle, alpm_mountpoint_t *mp; struct stat st; char path[PATH_MAX]; + blkcnt_t remove_size; const char *filename = file->name; snprintf(path, PATH_MAX, "%s%s", handle->root, filename); @@ -243,8 +244,8 @@ static int calculate_removed_size(alpm_handle_t *handle, } /* the addition of (divisor - 1) performs ceil() with integer division */ - mp->blocks_needed -= - (st.st_size + mp->fsp.f_bsize - 1) / mp->fsp.f_bsize; + remove_size = (st.st_size + mp->fsp.f_bsize - 1) / mp->fsp.f_bsize; + mp->blocks_needed -= remove_size; mp->used |= USED_REMOVE; } @@ -265,6 +266,7 @@ static int calculate_installed_size(alpm_handle_t *handle, const alpm_file_t *file = filelist->files + i; alpm_mountpoint_t *mp; char path[PATH_MAX]; + blkcnt_t install_size; const char *filename = file->name; /* libarchive reports these as zero size anyways */ @@ -289,8 +291,8 @@ static int calculate_installed_size(alpm_handle_t *handle, } /* the addition of (divisor - 1) performs ceil() with integer division */ - mp->blocks_needed += - (file->size + mp->fsp.f_bsize - 1) / mp->fsp.f_bsize; + install_size = (file->size + mp->fsp.f_bsize - 1) / mp->fsp.f_bsize; + mp->blocks_needed += install_size; mp->used |= USED_INSTALL; } |