Fix -Wshadow warning with emu build on NetBSD.

diff --git a/ChangeLog b/ChangeLog
index b8e66c7a20beeff7d656d780d824a04dbef77543..ff7d02b44f3018ff96303471f61ff5425b0aeac3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-26  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+       * kern/emu/hostdisk.c (find_partition_start) [__NetBSD__]: Renamed
+       variable index into p_index to suppress a warning with -Wshadow.
+
 2010-05-25  BVK Chaitanya  <bvk.groups@gmail.com>
 
        * INSTALL: Added flex >= 2.5.35 requirement.

diff --git a/kern/emu/hostdisk.c b/kern/emu/hostdisk.c
index 9c469755224d2f3aff80eb3458b1427c123cfcb1..ae2f7d9adaa264d2b55417584f54cc3caafaab59 100644 (file)
--- a/kern/emu/hostdisk.c
+++ b/kern/emu/hostdisk.c
@@ -338,7 +338,7 @@ find_partition_start (const char *dev)
   struct hd_geometry hdg;
 # else /* defined(__NetBSD__) */
   struct disklabel label;
-  int index;
+  int p_index;
 # endif /* !defined(__NetBSD__) */
 
 # ifdef HAVE_DEVICE_MAPPER
@@ -435,15 +435,15 @@ devmapper_fail:
 # if !defined(__NetBSD__)
   return hdg.start;
 # else /* defined(__NetBSD__) */
-  index = dev[strlen(dev) - 1] - 'a';
+  p_index = dev[strlen(dev) - 1] - 'a';
 
-  if (index >= label.d_npartitions)
+  if (p_index >= label.d_npartitions)
     {
       grub_error (GRUB_ERR_BAD_DEVICE,
                  "no disk label entry for `%s'", dev);
       return 0;
     }
-  return (grub_disk_addr_t) label.d_partitions[index].p_offset;
+  return (grub_disk_addr_t) label.d_partitions[p_index].p_offset;
 # endif /* !defined(__NetBSD__) */
 }
 #endif /* __linux__ || __CYGWIN__ */