* grub-core/osdep/unix/getroot.c (grub_util_check_block_device): Remove.

	(grub_util_check_char_device): Likewise.
	* include/grub/emu/getroot.h: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 8c8d8919ff4417db6734dac390599cb6ae273b22..3c9c46d89c2c1499fb74c1eb68b35f56c3b22612 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/osdep/unix/getroot.c (grub_util_check_block_device): Remove.
+       (grub_util_check_char_device): Likewise.
+       * include/grub/emu/getroot.h: Likewise.
+
 2013-10-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/lib/libgcrypt_wrap/cipher_wrap.h: Use define for defining

diff --git a/grub-core/osdep/unix/getroot.c b/grub-core/osdep/unix/getroot.c
index b722cf446920077ac93e9483f98237eb98fd5aa2..f1ff596a9c54adfb5f8360dccfd1e9063965f951 100644 (file)
--- a/grub-core/osdep/unix/getroot.c
+++ b/grub-core/osdep/unix/getroot.c
@@ -938,35 +938,6 @@ grub_util_biosdisk_is_floppy (grub_disk_t disk)
   return 0;
 }
 
-const char *
-grub_util_check_block_device (const char *blk_dev)
-{
-  struct stat st;
-
-  if (stat (blk_dev, &st) < 0)
-    grub_util_error (_("cannot stat `%s': %s"), blk_dev,
-                    strerror (errno));
-
-  if (S_ISBLK (st.st_mode))
-    return (blk_dev);
-  else
-    return 0;
-}
-
-const char *
-grub_util_check_char_device (const char *blk_dev)
-{
-  struct stat st;
-
-  if (stat (blk_dev, &st) < 0)
-    grub_util_error (_("cannot stat `%s': %s"), blk_dev, strerror (errno));
-
-  if (S_ISCHR (st.st_mode))
-    return (blk_dev);
-  else
-    return 0;
-}
-
 #else
 
 void

diff --git a/include/grub/emu/getroot.h b/include/grub/emu/getroot.h
index d3b2f5f6bd2e600944a8a114884740d5f8680471..061b94f2677683bc40762f3ed8d35d4e0a264ed0 100644 (file)
--- a/include/grub/emu/getroot.h
+++ b/include/grub/emu/getroot.h
@@ -36,8 +36,6 @@ void grub_util_pull_device (const char *osname);
 char **grub_guess_root_devices (const char *dir);
 int grub_util_get_dev_abstraction (const char *os_dev);
 char *grub_make_system_path_relative_to_its_root (const char *path);
-const char *grub_util_check_block_device (const char *blk_dev);
-const char *grub_util_check_char_device (const char *blk_dev);
 char *grub_util_get_grub_dev (const char *os_dev);
 #if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
 void grub_util_follow_gpart_up (const char *name, grub_disk_addr_t *off_out,