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.

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.
 

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)
 		{

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,

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 */

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;

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;

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;