2008-01-25 Robert Millan <rmh@aybabtu.com>

        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.

diff --git a/ChangeLog b/ChangeLog
index 75e91fd538b1a1cf8e7204167561b1012577eec7..485be06d092e732624ee81ec4ba54bcebd88f900 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-25  Robert Millan  <rmh@aybabtu.com>
+
+       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  <proski@gnu.org>
 
        * include/grub/ieee1275/ieee1275.h: Introduce flag for firmwares

diff --git a/kern/disk.c b/kern/disk.c
index e08263e65bfc65cfe8096461dc67d502dbdcd5eb..08389b9d210178eebe394771fb15d129f7775f6c 100644 (file)
--- 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 fe9a4060275836f5c8a57b9084a005eb254ab47d..adf55daf38c69eea9d2d8dbb6434fa866f159a97 100644 (file)
--- 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;