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.

diff --git a/ChangeLog b/ChangeLog
index 33b0ea3bd3f5e255bd02c867a46709650de2f4d9..4de8073eec163884342108c130bc3924fa5de269 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 

diff --git a/util/hostdisk.c b/util/hostdisk.c
index 5c56b75795914a3c0acfd0d77ef4c609218ef69b..9a3f30ce048ea60968591011d1d6bd045a751912 100644 (file)
--- a/util/hostdisk.c
+++ b/util/hostdisk.c
@@ -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;