diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2012-05-08 17:23:58 -0400 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-05-20 17:54:42 -0500 |
| commit | e533478e02882170653d79b756ae3d5690d076e9 (patch) | |
| tree | beb9840e8359b505426ea34a2095679f28a7f024 /lib/libalpm/conflict.c | |
| parent | 363894e27b07f00d7b1cd9f92214f3f457ac4c48 (diff) | |
| download | pacman-e533478e02882170653d79b756ae3d5690d076e9.tar.xz | |
fix -Wshadow warnings as reported by gcc 4.4.3
Apparently gcc 4.7 has decided that -Wshadow warnings aren't worth
reporting anymore even with the flag enabled. These were found on
an Ubuntu 10.04 install.
Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/conflict.c')
| -rw-r--r-- | lib/libalpm/conflict.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 5714932c..3b8fce0e 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -380,7 +380,7 @@ static int dir_belongsto_pkg(const char *root, const char *dirpath, * 1: check every target against every target * 2: check every target against the filesystem */ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, - alpm_list_t *upgrade, alpm_list_t *remove) + alpm_list_t *upgrade, alpm_list_t *rem) { alpm_list_t *i, *conflicts = NULL; size_t numtargs = alpm_list_count(upgrade); @@ -498,7 +498,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, relative_path = path + rootlen; /* Check remove list (will we remove the conflicting local file?) */ - for(k = remove; k && !resolved_conflict; k = k->next) { + for(k = rem; k && !resolved_conflict; k = k->next) { alpm_pkg_t *rempkg = k->data; if(rempkg && _alpm_filelist_contains(alpm_pkg_get_files(rempkg), relative_path)) { |