2008-03-30 Pavel Roskin <proski@gnu.org>

	* fs/udf.c (grub_udf_mount): Fix warning about a shadowing a
	variable.
	* include/grub/i386/loader.h: Change declaration of
	grub_linux_boot() to match what grub_loader_set() expects.
	* util/getroot.c (grub_guess_root_device): Return const char* to
	fix a warning.
	* util/grub-probe.c (probe): Fix a warning about uninitialized
	abstraction_name variable.
	* util/i386/get_disk_name.c (grub_util_get_disk_name): Mark
	second argument as unused to fix a warning.

diff --git a/ChangeLog b/ChangeLog
index 3c88328275431ec2ca316f5d482db1d2a912082e..f505f94e2aa4f5407449ec9eaa00c929c8ba9885 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2008-03-30  Pavel Roskin  <proski@gnu.org>
 
+       * fs/udf.c (grub_udf_mount): Fix warning about a shadowing a
+       variable.
+       * include/grub/i386/loader.h: Change declaration of
+       grub_linux_boot() to match what grub_loader_set() expects.
+       * util/getroot.c (grub_guess_root_device): Return const char* to
+       fix a warning.
+       * util/grub-probe.c (probe): Fix a warning about uninitialized
+       abstraction_name variable.
+       * util/i386/get_disk_name.c (grub_util_get_disk_name): Mark
+       second argument as unused to fix a warning.
+
        * loader/i386/pc/multiboot2.c (grub_mb2_arch_elf64_hook): Add
        missing grub_error() call.
 

diff --git a/fs/udf.c b/fs/udf.c
index e07d9624efcd4b93f5e0712cba73a09f03138020..8f833eb3c813043f9e4dba00c6a15742f434ccee 100644 (file)
--- a/fs/udf.c
+++ b/fs/udf.c
@@ -603,7 +603,7 @@ grub_udf_mount (grub_disk_t disk)
        }
       else if (tag.tag_ident == GRUB_UDF_TAG_IDENT_LVD)
        {
-         int i;
+         int k;
 
          struct grub_udf_partmap *ppm;
 
@@ -622,7 +622,7 @@ grub_udf_mount (grub_disk_t disk)
            }
 
          ppm = (struct grub_udf_partmap *) &data->lvd.part_maps;
-         for (i = U32 (data->lvd.num_part_maps); i > 0; i--)
+         for (k = U32 (data->lvd.num_part_maps); k > 0; k--)
            {
              if (ppm->type != GRUB_UDF_PARTMAP_TYPE_1)
                {

diff --git a/include/grub/i386/loader.h b/include/grub/i386/loader.h
index 5f912cd1c5ede3923fe031f4cd5bb2f48285bf98..b120207a9e2da943bf34eb4ab445d4bb7e70eff6 100644 (file)
--- a/include/grub/i386/loader.h
+++ b/include/grub/i386/loader.h
@@ -20,6 +20,7 @@
 #define GRUB_LOADER_CPU_HEADER 1
 
 #include <grub/types.h>
+#include <grub/err.h>
 #include <grub/symbol.h>
 #include <grub/multiboot.h>
 
@@ -30,7 +31,7 @@ extern grub_int32_t EXPORT_VAR(grub_linux_is_bzimage);
 extern grub_addr_t EXPORT_VAR(grub_os_area_addr);
 extern grub_size_t EXPORT_VAR(grub_os_area_size);
 
-void EXPORT_FUNC(grub_linux_boot) (void) __attribute__ ((noreturn));
+grub_err_t EXPORT_FUNC(grub_linux_boot) (void);
 
 /* The asm part of the multiboot loader.  */
 void EXPORT_FUNC(grub_multiboot_real_boot) (grub_addr_t entry,

diff --git a/include/grub/util/getroot.h b/include/grub/util/getroot.h
index 0d78538dfc77ff6b8e5257ede8c4deb9339287d7..bf0c55ca48814b5c22c033bff6b7968f852522c5 100644 (file)
--- a/include/grub/util/getroot.h
+++ b/include/grub/util/getroot.h
@@ -29,6 +29,6 @@ char *grub_guess_root_device (const char *dir);
 char *grub_get_prefix (const char *dir);
 int grub_util_get_dev_abstraction (const char *os_dev);
 char *grub_util_get_grub_dev (const char *os_dev);
-char *grub_util_check_block_device (const char *blk_dev);
+const char *grub_util_check_block_device (const char *blk_dev);
 
 #endif /* ! GRUB_UTIL_GETROOT_HEADER */

diff --git a/util/getroot.c b/util/getroot.c
index 0c4b376e7ffa4b8e6f863f51dd21b839fd601d80..5a9821883d723d8c73a5fc788a2d0954935e40a6 100644 (file)
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -333,7 +333,7 @@ grub_util_get_grub_dev (const char *os_dev)
   return grub_dev;
 }
 
-char *
+const char *
 grub_util_check_block_device (const char *blk_dev)
 {
   struct stat st;

diff --git a/util/grub-probe.c b/util/grub-probe.c
index 07c6ca12c5d520062850d6374e236294bf3ec7c4..063b8f63d0bf405cc24650714841232469f0ca1d 100644 (file)
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -135,15 +135,15 @@ probe (const char *path, char *device_name)
       char *abstraction_name;
       switch (abstraction_type)
        {
-       case GRUB_DEV_ABSTRACTION_NONE:
-         grub_util_info ("did not find LVM/RAID in %s, assuming raw device", device_name);
-         goto end;
        case GRUB_DEV_ABSTRACTION_LVM:
          abstraction_name = "lvm";
          break;
        case GRUB_DEV_ABSTRACTION_RAID:
          abstraction_name = "raid";
          break;
+       default:
+         grub_util_info ("did not find LVM/RAID in %s, assuming raw device", device_name);
+         goto end;
        }
       printf ("%s\n", abstraction_name);
       goto end;

diff --git a/util/i386/get_disk_name.c b/util/i386/get_disk_name.c
index d06b337ff2a3a2d9b86b4e421c5e1eab92ebd528..38195e2489ef1ce10b957a80ae7d2b29158d467b 100644 (file)
--- a/util/i386/get_disk_name.c
+++ b/util/i386/get_disk_name.c
@@ -20,7 +20,7 @@
 #include <grub/util/misc.h>
 
 char *
-grub_util_get_disk_name (int disk, char *name)
+grub_util_get_disk_name (int disk, char *name  __attribute__ ((unused)))
 {
   char *p;