Add -Wshadow to the gcc command line options used when compiling the binutils.

Fix up all warnings generated by the addition of this switch.

1 files changed, 10 insertions, 10 deletions

diff --git a/binutils/resres.c b/binutils/resres.c
index c4eb7227bba..9f90df0a506 100644
--- a/binutils/resres.c
+++ b/binutils/resres.c
@@ -647,7 +647,7 @@ res_add_resource (rc_res_resource *r, const rc_res_id *type, const rc_res_id *id
    and modified to add an existing resource.
  */
 static void
-res_append_resource (rc_res_directory **resources, rc_res_resource *resource,
+res_append_resource (rc_res_directory **res_dirs, rc_res_resource *resource,
 		     int cids, const rc_res_id *ids, int dupok)
 {
   rc_res_entry *re = NULL;
@@ -658,7 +658,7 @@ res_append_resource (rc_res_directory **resources, rc_res_resource *resource,
     {
       rc_res_entry **pp;
 
-      if (*resources == NULL)
+      if (*res_dirs == NULL)
 	{
 	  static unsigned long timeval;
 
@@ -667,16 +667,16 @@ res_append_resource (rc_res_directory **resources, rc_res_resource *resource,
 	  if (timeval == 0)
 	    timeval = time (NULL);
 
-	  *resources = ((rc_res_directory *)
+	  *res_dirs = ((rc_res_directory *)
 			res_alloc (sizeof (rc_res_directory)));
-	  (*resources)->characteristics = 0;
-	  (*resources)->time = timeval;
-	  (*resources)->major = 0;
-	  (*resources)->minor = 0;
-	  (*resources)->entries = NULL;
+	  (*res_dirs)->characteristics = 0;
+	  (*res_dirs)->time = timeval;
+	  (*res_dirs)->major = 0;
+	  (*res_dirs)->minor = 0;
+	  (*res_dirs)->entries = NULL;
 	}
 
-      for (pp = &(*resources)->entries; *pp != NULL; pp = &(*pp)->next)
+      for (pp = &(*res_dirs)->entries; *pp != NULL; pp = &(*pp)->next)
 	if (res_id_cmp ((*pp)->id, ids[i]) == 0)
 	  break;
 
@@ -711,7 +711,7 @@ res_append_resource (rc_res_directory **resources, rc_res_resource *resource,
 	      xexit (1);
 	    }
 
-	  resources = &re->u.dir;
+	  res_dirs = &re->u.dir;
 	}
     }