vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
(grub_util_check_char_device): Likewise.
	* include/grub/emu/getroot.h: Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-19 00:51:08 +02:00
parent 1e3e741940
commit f90a3cc0a8
3 changed files with 6 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> 2013-10-18 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/lib/libgcrypt_wrap/cipher_wrap.h: Use define for defining * grub-core/lib/libgcrypt_wrap/cipher_wrap.h: Use define for defining

29
grub-core/osdep/unix/getroot.c
View file

@ -938,35 +938,6 @@ grub_util_biosdisk_is_floppy (grub_disk_t disk)
return 0; 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 #else
void void

2
include/grub/emu/getroot.h
View file

@ -36,8 +36,6 @@ void grub_util_pull_device (const char *osname);
char **grub_guess_root_devices (const char *dir); char **grub_guess_root_devices (const char *dir);
int grub_util_get_dev_abstraction (const char *os_dev); int grub_util_get_dev_abstraction (const char *os_dev);
char *grub_make_system_path_relative_to_its_root (const char *path); 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); char *grub_util_get_grub_dev (const char *os_dev);
#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__) #if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
void grub_util_follow_gpart_up (const char *name, grub_disk_addr_t *off_out, void grub_util_follow_gpart_up (const char *name, grub_disk_addr_t *off_out,