tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kern: Make grub_error() more verbose

Browse Source 
Signed-off-by: Peter Jones <pjones@redhat.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Peter Jones 2025-09-23 17:33:31 -06:00 committed by Daniel Kiper
parent 8abbafa493
commit 75a20cc144
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
grub-core/kern/err.c
View File

@ -33,15 +33,24 @@ static struct grub_error_saved grub_error_stack_items[GRUB_ERROR_STACK_SIZE];
static int grub_error_stack_pos;
static int grub_error_stack_assert;
#ifdef grub_error
#undef grub_error
#endif
grub_err_t
grub_error (grub_err_t n, const char *fmt, ...)
grub_error (grub_err_t n, const char *file, const int line, const char *fmt, ...)
{
va_list ap;
int m;
grub_errno = n;
m = grub_snprintf (grub_errmsg, sizeof (grub_errmsg), "%s:%d:", file, line);
if (m < 0)
m = 0;
va_start (ap, fmt);
grub_vsnprintf (grub_errmsg, sizeof (grub_errmsg), _(fmt), ap);
grub_vsnprintf (grub_errmsg + m, sizeof (grub_errmsg) - m, _(fmt), ap);
va_end (ap);
return n;

7
include/grub/err.h
View File

@ -89,8 +89,11 @@ struct grub_error_saved
extern grub_err_t EXPORT_VAR(grub_errno);
extern char EXPORT_VAR(grub_errmsg)[GRUB_MAX_ERRMSG];
grub_err_t EXPORT_FUNC(grub_error) (grub_err_t n, const char *fmt, ...)
__attribute__ ((format (GNU_PRINTF, 2, 3)));
grub_err_t EXPORT_FUNC(grub_error) (grub_err_t n, const char *file, const int line, const char *fmt, ...)
__attribute__ ((format (GNU_PRINTF, 4, 5)));
#define grub_error(n, fmt, ...) grub_error (n, __FILE__, __LINE__, fmt, ##__VA_ARGS__)
void EXPORT_FUNC(grub_fatal) (const char *fmt, ...) __attribute__ ((noreturn));
void EXPORT_FUNC(grub_error_push) (void);
int EXPORT_FUNC(grub_error_pop) (void);