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

2008-08-14 Felix Zielcke <fzielcke@z-51.de>

Browse source 
* include/grub/err.h (grub_err_printf): New function prototype.
        * util/misc.c (grub_err_printf): New function.
        * kern/misc.c [! GRUB_UTIL] (grub_err_printf): New alias for
        grub_printf.
        * kern/err.c (grub_print_error): Use grub_err_printf.
This commit is contained in:
fzielcke 2008-08-14 18:46:47 +00:00
parent 7161f0e02b
commit b86408f869
5 changed files with 33 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2008-08-14 Felix Zielcke <fzielcke@z-51.de>
* include/grub/err.h (grub_err_printf): New function prototype.
* util/misc.c (grub_err_printf): New function.
* kern/misc.c [! GRUB_UTIL] (grub_err_printf): New alias for
grub_printf.
* kern/err.c (grub_print_error): Use grub_err_printf.
2008-08-13 Robert Millan <rmh@aybabtu.com> 2008-08-13 Robert Millan <rmh@aybabtu.com>
* docs/grub.cfg: Remove `/dev/' prefix in GNU/Hurd boot entry. * docs/grub.cfg: Remove `/dev/' prefix in GNU/Hurd boot entry.

4
include/grub/err.h
View file

@ -1,7 +1,7 @@
/* err.h - error numbers and prototypes */ /* err.h - error numbers and prototypes */
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 2002,2005,2007 Free Software Foundation, Inc. * Copyright (C) 2002,2005,2007,2008 Free Software Foundation, Inc.
* *
* GRUB is free software: you can redistribute it and/or modify * GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -64,5 +64,7 @@ void EXPORT_FUNC(grub_fatal) (const char *fmt, ...) __attribute__ ((noreturn));
void EXPORT_FUNC(grub_error_push) (void); void EXPORT_FUNC(grub_error_push) (void);
int EXPORT_FUNC(grub_error_pop) (void); int EXPORT_FUNC(grub_error_pop) (void);
void EXPORT_FUNC(grub_print_error) (void); void EXPORT_FUNC(grub_print_error) (void);
int EXPORT_FUNC(grub_err_printf) (const char *fmt, ...)
__attribute__ ((format (printf, 1, 2)));
#endif /* ! GRUB_ERR_HEADER */ #endif /* ! GRUB_ERR_HEADER */

6
kern/err.c
View file

@ -1,7 +1,7 @@
/* err.c - error handling routines */ /* err.c - error handling routines */
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 2002,2005,2007 Free Software Foundation, Inc. * Copyright (C) 2002,2005,2007,2008 Free Software Foundation, Inc.
* *
* GRUB is free software: you can redistribute it and/or modify * GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -121,14 +121,14 @@ grub_print_error (void)
do do
{ {
if (grub_errno != GRUB_ERR_NONE) if (grub_errno != GRUB_ERR_NONE)
grub_printf ("error: %s\n", grub_errmsg); grub_err_printf ("error: %s\n", grub_errmsg);
} }
while (grub_error_pop ()); while (grub_error_pop ());
/* If there was an assert while using error stack, report about it. */ /* If there was an assert while using error stack, report about it. */
if (grub_error_stack_assert) if (grub_error_stack_assert)
{ {
grub_printf ("assert: error stack overflow detected!\n"); grub_err_printf ("assert: error stack overflow detected!\n");
grub_error_stack_assert = 0; grub_error_stack_assert = 0;
} }
} }

5
kern/misc.c
View file

@ -134,6 +134,11 @@ grub_printf (const char *fmt, ...)
return ret; return ret;
} }
#ifndef GRUB_UTIL
int grub_err_printf (const char *fmt, ...)
__attribute__ ((alias("grub_printf")));
#endif
void void
grub_real_dprintf (const char *file, const int line, const char *condition, grub_real_dprintf (const char *file, const int line, const char *condition,
const char *fmt, ...) const char *fmt, ...)

15
util/misc.c
View file

@ -1,6 +1,6 @@
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 2002,2003,2005,2006,2007 Free Software Foundation, Inc. * Copyright (C) 2002,2003,2005,2006,2007,2008 Free Software Foundation, Inc.
* *
* GRUB is free software: you can redistribute it and/or modify * GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -74,6 +74,19 @@ grub_util_error (const char *fmt, ...)
exit (1); exit (1);
} }
int
grub_err_printf (const char *fmt, ...)
{
va_list ap;
int ret;
va_start (ap, fmt);
ret = vfprintf (stderr, fmt, ap);
va_end (ap);
return ret;
}
void * void *
xmalloc (size_t size) xmalloc (size_t size)
{ {