vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix -Wshadow warning with emu build on NetBSD.

Browse source
This commit is contained in:
Grégoire Sutre 2010-05-26 23:49:52 +02:00
parent 7d8c021353
commit 95ac3c730c
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2010-05-25 BVK Chaitanya <bvk.groups@gmail.com>
* INSTALL: Added flex >= 2.5.35 requirement. * INSTALL: Added flex >= 2.5.35 requirement.

8
kern/emu/hostdisk.c
View file

@ -338,7 +338,7 @@ find_partition_start (const char *dev)
struct hd_geometry hdg; struct hd_geometry hdg;
# else /* defined(__NetBSD__) */ # else /* defined(__NetBSD__) */
struct disklabel label; struct disklabel label;
int index; int p_index;
# endif /* !defined(__NetBSD__) */ # endif /* !defined(__NetBSD__) */
# ifdef HAVE_DEVICE_MAPPER # ifdef HAVE_DEVICE_MAPPER
@ -435,15 +435,15 @@ devmapper_fail:
# if !defined(__NetBSD__) # if !defined(__NetBSD__)
return hdg.start; return hdg.start;
# else /* defined(__NetBSD__) */ # 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, grub_error (GRUB_ERR_BAD_DEVICE,
"no disk label entry for `%s'", dev); "no disk label entry for `%s'", dev);
return 0; 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 /* !defined(__NetBSD__) */
} }
#endif /* __linux__ || __CYGWIN__ */ #endif /* __linux__ || __CYGWIN__ */