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

Define GRUB_UTIL_FD_O_* and always use them with grub_util_fd_open.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-14 02:11:59 +02:00
parent 84379b61d2
commit 6de292cb9b
8 changed files with 67 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
grub-core/disk/cryptodisk.c
View file

@ -505,7 +505,7 @@ grub_cryptodisk_open (const char *name, grub_disk_t disk)
if (dev->cheat)
{
if (!GRUB_UTIL_FD_IS_VALID (dev->cheat_fd))
dev->cheat_fd = grub_util_fd_open (dev->cheat, O_RDONLY);
dev->cheat_fd = grub_util_fd_open (dev->cheat, GRUB_UTIL_FD_O_RDONLY);
if (!GRUB_UTIL_FD_IS_VALID (dev->cheat_fd))
return grub_error (GRUB_ERR_IO, N_("cannot open `%s': %s"),
dev->cheat, strerror (errno));

2
grub-core/disk/geli.c
View file

@ -210,7 +210,7 @@ make_uuid (const struct grub_geli_phdr *header,
char *
grub_util_get_geli_uuid (const char *dev)
{
grub_util_fd_t fd = grub_util_fd_open (dev, O_RDONLY);
grub_util_fd_t fd = grub_util_fd_open (dev, GRUB_UTIL_FD_O_RDONLY);
grub_uint64_t s;
unsigned log_secsize;
grub_uint8_t hdr[512];