From b95f71b5a3d836a3cbb5173ddd3f50d2226cd8b6 Mon Sep 17 00:00:00 2001 From: robertmh Date: Fri, 25 Jan 2008 20:57:40 +0000 Subject: [PATCH] 2008-01-25 Robert Millan Revert my previous commits (based on wrong assumption of how grub_errno works). * kern/disk.c (grub_disk_open): Stop reseting grub_errno. * kern/file.c (grub_file_open): Likewise. --- ChangeLog | 8 ++++++++ kern/disk.c | 3 --- kern/file.c | 3 --- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 75e91fd53..485be06d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-01-25 Robert Millan + + Revert my previous commits (based on wrong assumption of how grub_errno + works). + + * kern/disk.c (grub_disk_open): Stop reseting grub_errno. + * kern/file.c (grub_file_open): Likewise. + 2008-01-24 Pavel Roskin * include/grub/ieee1275/ieee1275.h: Introduce flag for firmwares diff --git a/kern/disk.c b/kern/disk.c index e08263e65..08389b9d2 100644 --- a/kern/disk.c +++ b/kern/disk.c @@ -217,9 +217,6 @@ grub_disk_open (const char *name) char *raw = (char *) name; unsigned long current_time; - /* Do not account previous failures when grub_errno is checked for. */ - grub_errno = GRUB_ERR_NONE; - grub_dprintf ("disk", "Opening `%s'...\n", name); disk = (grub_disk_t) grub_malloc (sizeof (*disk)); diff --git a/kern/file.c b/kern/file.c index fe9a40602..adf55daf3 100644 --- a/kern/file.c +++ b/kern/file.c @@ -59,9 +59,6 @@ grub_file_open (const char *name) char *device_name; char *file_name; - /* Do not account previous failures when grub_errno is checked for. */ - grub_errno = GRUB_ERR_NONE; - device_name = grub_file_get_device_name (name); if (grub_errno) return 0;