From f892ac66084ab0315adb0c52e4a39b518730d023 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 24 Jul 2018 16:24:23 -0400 Subject: New upstream version 15+1531942534.dd3230d --- errlog.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'errlog.c') diff --git a/errlog.c b/errlog.c index fd789335..18be4822 100644 --- a/errlog.c +++ b/errlog.c @@ -7,10 +7,6 @@ #include "shim.h" -#ifdef LogError -#undef LogError -#endif - static CHAR16 **errs = NULL; static UINTN nerrs = 0; @@ -51,16 +47,16 @@ VLogError(const char *file, int line, const char *func, CHAR16 *fmt, va_list arg } EFI_STATUS -LogError(const char *file, int line, const char *func, CHAR16 *fmt, ...) +LogError_(const char *file, int line, const char *func, CHAR16 *fmt, ...) { va_list args; - EFI_STATUS status; + EFI_STATUS efi_status; va_start(args, fmt); - status = VLogError(file, line, func, fmt, args); + efi_status = VLogError(file, line, func, fmt, args); va_end(args); - return status; + return efi_status; } VOID @@ -72,7 +68,7 @@ PrintErrors(VOID) return; for (i = 0; i < nerrs; i++) - Print(L"%s", errs[i]); + console_print(L"%s", errs[i]); } VOID -- cgit v1.2.3