From f033a1da9f4c3acf7e3dfef906d01e348b6fcf42 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 9 Mar 2021 11:42:34 -0500
Subject: Restructure our includes.

This re-structures our includes so we can be sure everything is always
including all the system headers in a uniform, predictable way.

Temporarily it also adds a bunch of junk at all the places we use
variadic functions to specifically pick either the MS (cdecl) or ELF
ABIs.

I'm not 100% sure that's all correct (see later patch) but it's enough
to allow this to build.

Signed-off-by: Peter Jones <pjones@redhat.com>
---
 errlog.c | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'errlog.c')

diff --git a/errlog.c b/errlog.c
index 714d09d3..16af23b0 100644
--- a/errlog.c
+++ b/errlog.c
@@ -5,30 +5,29 @@
  */
 
 #include "shim.h"
-#include "hexdump.h"
 
 static CHAR16 **errs = NULL;
 static UINTN nerrs = 0;
 
-EFI_STATUS
-vdprint_(const CHAR16 *fmt, const char *file, int line, const char *func, va_list args)
+EFI_STATUS EFIAPI
+vdprint_(const CHAR16 *fmt, const char *file, int line, const char *func, elf_va_list args)
 {
-	va_list args2;
+	elf_va_list args2;
 	EFI_STATUS efi_status = EFI_SUCCESS;
 
 	if (verbose) {
-		va_copy(args2, args);
+		elf_va_copy(args2, args);
 		console_print(L"%a:%d:%a() ", file, line, func);
 		efi_status = VPrint(fmt, args2);
-		va_end(args2);
+		elf_va_end(args2);
 	}
 	return efi_status;
 }
 
-EFI_STATUS
-VLogError(const char *file, int line, const char *func, const CHAR16 *fmt, va_list args)
+EFI_STATUS EFIAPI
+VLogError(const char *file, int line, const char *func, const CHAR16 *fmt, elf_va_list args)
 {
-	va_list args2;
+	elf_va_list args2;
 	CHAR16 **newerrs;
 
 	newerrs = ReallocatePool(errs, (nerrs + 1) * sizeof(*errs),
@@ -39,11 +38,11 @@ VLogError(const char *file, int line, const char *func, const CHAR16 *fmt, va_li
 	newerrs[nerrs] = PoolPrint(L"%a:%d %a() ", file, line, func);
 	if (!newerrs[nerrs])
 		return EFI_OUT_OF_RESOURCES;
-	va_copy(args2, args);
+	elf_va_copy(args2, args);
 	newerrs[nerrs+1] = VPoolPrint(fmt, args2);
 	if (!newerrs[nerrs+1])
 		return EFI_OUT_OF_RESOURCES;
-	va_end(args2);
+	elf_va_end(args2);
 
 	nerrs += 2;
 	newerrs[nerrs] = NULL;
@@ -52,15 +51,15 @@ VLogError(const char *file, int line, const char *func, const CHAR16 *fmt, va_li
 	return EFI_SUCCESS;
 }
 
-EFI_STATUS
+EFI_STATUS EFIAPI
 LogError_(const char *file, int line, const char *func, const CHAR16 *fmt, ...)
 {
-	va_list args;
+	elf_va_list args;
 	EFI_STATUS efi_status;
 
-	va_start(args, fmt);
+	elf_va_start(args, fmt);
 	efi_status = VLogError(file, line, func, fmt, args);
-	va_end(args);
+	elf_va_end(args);
 
 	return efi_status;
 }
-- 
cgit v1.2.3