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>

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)) {