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.

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;