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

* grub-core/disk/cryptodisk.c: Use grub_util_fd_strerror instead

Browse source 
of strerror.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-15 17:52:43 +02:00
parent 5a869940de
commit 20d535419f
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-10-15 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/disk/cryptodisk.c: Use grub_util_fd_strerror instead
of strerror.
2013-10-15 Vladimir Serbinenko <phcoder@gmail.com>
Split out blocklist retrieving from setup.c to

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

@ -27,13 +27,7 @@
#include <grub/procfs.h>
#ifdef GRUB_UTIL
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <grub/emu/hostdisk.h>
#include <unistd.h>
#include <string.h>
#endif
GRUB_MOD_LICENSE ("GPLv3+");
@ -508,7 +502,7 @@ grub_cryptodisk_open (const char *name, grub_disk_t disk)
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));
dev->cheat, grub_util_fd_strerror ());
}
#endif
@ -568,7 +562,7 @@ grub_cryptodisk_read (grub_disk_t disk, grub_disk_addr_t sector,
if (grub_util_fd_read (dev->cheat_fd, buf, size << disk->log_sector_size)
!= (ssize_t) (size << disk->log_sector_size))
return grub_error (GRUB_ERR_READ_ERROR, N_("cannot read `%s': %s"),
dev->cheat, strerror (errno));
dev->cheat, grub_util_fd_strerror ());
return GRUB_ERR_NONE;
}
#endif
@ -613,7 +607,7 @@ grub_cryptodisk_write (grub_disk_t disk, grub_disk_addr_t sector,
if (grub_util_fd_write (dev->cheat_fd, buf, size << disk->log_sector_size)
!= (ssize_t) (size << disk->log_sector_size))
return grub_error (GRUB_ERR_READ_ERROR, N_("cannot read `%s': %s"),
dev->cheat, strerror (errno));
dev->cheat, grub_util_fd_strerror ());
return GRUB_ERR_NONE;
}
#endif