From 0bff94b170116737e6e0838c35c0ac376542a5c0 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 12 Feb 2019 18:04:49 -0500 Subject: [PATCH 4/4] Make VLogError() behave as expected. Signed-off-by: Peter Jones --- errlog.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/errlog.c b/errlog.c index 18be4822d53..eebb266d396 100644 --- a/errlog.c +++ b/errlog.c @@ -14,29 +14,20 @@ EFI_STATUS VLogError(const char *file, int line, const char *func, CHAR16 *fmt, va_list args) { va_list args2; - UINTN size = 0, size2; CHAR16 **newerrs; - size = SPrint(NULL, 0, L"%a:%d %a() ", file, line, func); - va_copy(args2, args); - size2 = VSPrint(NULL, 0, fmt, args2); - va_end(args2); - newerrs = ReallocatePool(errs, (nerrs + 1) * sizeof(*errs), (nerrs + 3) * sizeof(*errs)); if (!newerrs) return EFI_OUT_OF_RESOURCES; - newerrs[nerrs] = AllocatePool(size*2+2); + newerrs[nerrs] = PoolPrint(L"%a:%d %a() ", file, line, func); if (!newerrs[nerrs]) return EFI_OUT_OF_RESOURCES; - newerrs[nerrs+1] = AllocatePool(size2*2+2); + va_copy(args2, args); + newerrs[nerrs+1] = VPoolPrint(fmt, args2); if (!newerrs[nerrs+1]) return EFI_OUT_OF_RESOURCES; - - SPrint(newerrs[nerrs], size*2+2, L"%a:%d %a() ", file, line, func); - va_copy(args2, args); - VSPrint(newerrs[nerrs+1], size2*2+2, fmt, args2); va_end(args2); nerrs += 2; -- 2.20.1