2010-02-07 Vladimir Serbinenko <phcoder@gmail.com>

Fix warnings in grub-emu when compiling with maximum warning options.

	* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Rename one instance
	of disk to dsk to avoid shadowing.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-02-07 02:44:47 +01:00
parent 98e6959dea
commit f88d801b17
2 changed files with 4 additions and 2 deletions

View File

@ -6,6 +6,8 @@
(grub_arch_modules_addr): Return 0 and not NULL.
* util/misc.c (ENABLE_RELOCATABLE): New definition.
(xstrdup): USe newstr instead of dup.
* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Rename one instance
of disk to dsk to avoid shadowing.
2010-02-07 Vladimir Serbinenko <phcoder@gmail.com>

View File

@ -981,10 +981,10 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
struct hd_geometry hdg;
int dos_part = -1;
int bsd_part = -1;
auto int find_partition (grub_disk_t disk,
auto int find_partition (grub_disk_t dsk,
const grub_partition_t partition);
int find_partition (grub_disk_t disk __attribute__ ((unused)),
int find_partition (grub_disk_t dsk __attribute__ ((unused)),
const grub_partition_t partition)
{
struct grub_msdos_partition *pcdata = NULL;