summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Jones <pjones@redhat.com>2025-02-19 11:03:08 -0500
committerPeter Jones <pjones@redhat.com>2025-02-24 15:22:28 -0500
commit5c1e6e45a0f54eaabea0f9405ed661b5028de30c (patch)
treeb7c6a9eceddd6d205cde0a44e263895b54d107a3
parent765f2944fb392be2e8f76f3503ae7ceab301fea4 (diff)
downloadefi-boot-shim-5c1e6e45a0f54eaabea0f9405ed661b5028de30c.tar.gz
efi-boot-shim-5c1e6e45a0f54eaabea0f9405ed661b5028de30c.zip
Move error logging decls out of shim.h
This moves decls for errlog.c into errlog.h Signed-off-by: Peter Jones <pjones@redhat.com>
-rw-r--r--include/errlog.h20
-rw-r--r--shim.h9
2 files changed, 21 insertions, 8 deletions
diff --git a/include/errlog.h b/include/errlog.h
new file mode 100644
index 00000000..bf59b2f9
--- /dev/null
+++ b/include/errlog.h
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: BSD-2-Clause-Patent
+/*
+ * errlog.h - error logging utilities
+ * Copyright Peter Jones <pjones@redhat.com>
+ */
+
+#ifndef ERRLOG_H_
+#define ERRLOG_H_
+
+extern EFI_STATUS EFIAPI LogError_(const char *file, int line, const char *func,
+ const CHAR16 *fmt, ...);
+extern EFI_STATUS EFIAPI VLogError(const char *file, int line, const char *func,
+ const CHAR16 *fmt, ms_va_list args);
+extern VOID LogHexdump_(const char *file, int line, const char *func,
+ const void *data, size_t sz);
+extern VOID PrintErrors(VOID);
+extern VOID ClearErrors(VOID);
+
+#endif /* !ERRLOG_H_ */
+// vim:fenc=utf-8:tw=75:noet
diff --git a/shim.h b/shim.h
index 09d23780..f2246c90 100644
--- a/shim.h
+++ b/shim.h
@@ -166,6 +166,7 @@
#include "include/crypt_blowfish.h"
#include "include/dp.h"
#include "include/efiauthenticated.h"
+#include "include/errlog.h"
#include "include/errors.h"
#include "include/execute.h"
#include "include/guid.h"
@@ -240,14 +241,6 @@ typedef struct _SHIM_LOCK {
extern EFI_STATUS shim_init(void);
extern void shim_fini(void);
-extern EFI_STATUS EFIAPI LogError_(const char *file, int line, const char *func,
- const CHAR16 *fmt, ...);
-extern EFI_STATUS EFIAPI VLogError(const char *file, int line, const char *func,
- const CHAR16 *fmt, ms_va_list args);
-extern VOID LogHexdump_(const char *file, int line, const char *func,
- const void *data, size_t sz);
-extern VOID PrintErrors(VOID);
-extern VOID ClearErrors(VOID);
extern VOID restore_loaded_image(VOID);
extern EFI_STATUS start_image(EFI_HANDLE image_handle, CHAR16 *ImagePath);
extern EFI_STATUS import_mok_state(EFI_HANDLE image_handle);