Re: [PATCH] kern/err.c + disk/raid.c error handling fixes

[Felix Zielcke <fzielcke@z-51.de>]

[-- Attachment #1: Type: text/plain, Size: 515 bytes --]

Am Dienstag, den 12.08.2008, 18:28 +0200 schrieb Felix Zielcke:

Ok naming the old patch kern_err.diff and the new one raid_err.diff
isn't a good idea :(


2008-08-12  Felix Zielcke <fzielcke@z-51.de>
  
        * kern/err.c [GRUB_UTIL]: Include <stdio.h>.
          [GRUB_UTIL] (grub_print_error): Use fprintf (stderr, ...) instead of   
          grub_printf.
        * disk/raid.c (GRUB_MOD_INIT): Use grub_print_error() to show RAID 
        errors and reset grub_errno. Do not give errors to the upper layer.


[-- Attachment #2: raid_err.diff --]
[-- Type: text/x-patch, Size: 915 bytes --]

Index: disk/raid.c
===================================================================
--- disk/raid.c	(revision 1800)
+++ disk/raid.c	(working copy)
@@ -581,6 +581,8 @@
 {
   grub_device_iterate (&grub_raid_scan_device);
   grub_disk_dev_register (&grub_raid_dev);
+  grub_print_error ();
+  grub_errno = GRUB_ERR_NONE;
 }
 
 GRUB_MOD_FINI(raid)
Index: kern/err.c
===================================================================
--- kern/err.c	(revision 1800)
+++ kern/err.c	(working copy)
@@ -21,6 +21,9 @@
 #include <grub/misc.h>
 #include <stdarg.h>
 
+#ifdef GRUB_UTIL
+#include <stdio.h>
+#endif
 #define GRUB_MAX_ERRMSG		256
 #define GRUB_ERROR_STACK_SIZE	10
 
@@ -121,7 +124,11 @@
   do
     {
       if (grub_errno != GRUB_ERR_NONE)
+#ifdef GRUB_UTIL
+	fprintf (stderr, "error: %s\n", grub_errmsg);
+#else
         grub_printf ("error: %s\n", grub_errmsg);
+#endif
     } 
   while (grub_error_pop ());