Skip to content

Commit 68026b6

Browse files
committed
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>
1 parent 7cde2cc commit 68026b6

File tree

2 files changed

+21
-8
lines changed

2 files changed

+21
-8
lines changed

include/errlog.h

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// SPDX-License-Identifier: BSD-2-Clause-Patent
2+
/*
3+
* errlog.h - error logging utilities
4+
* Copyright Peter Jones <pjones@redhat.com>
5+
*/
6+
7+
#ifndef ERRLOG_H_
8+
#define ERRLOG_H_
9+
10+
extern EFI_STATUS EFIAPI LogError_(const char *file, int line, const char *func,
11+
const CHAR16 *fmt, ...);
12+
extern EFI_STATUS EFIAPI VLogError(const char *file, int line, const char *func,
13+
const CHAR16 *fmt, ms_va_list args);
14+
extern VOID LogHexdump_(const char *file, int line, const char *func,
15+
const void *data, size_t sz);
16+
extern VOID PrintErrors(VOID);
17+
extern VOID ClearErrors(VOID);
18+
19+
#endif /* !ERRLOG_H_ */
20+
// vim:fenc=utf-8:tw=75:noet

shim.h

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@
166166
#include "include/crypt_blowfish.h"
167167
#include "include/dp.h"
168168
#include "include/efiauthenticated.h"
169+
#include "include/errlog.h"
169170
#include "include/errors.h"
170171
#include "include/execute.h"
171172
#include "include/guid.h"
@@ -240,14 +241,6 @@ typedef struct _SHIM_LOCK {
240241

241242
extern EFI_STATUS shim_init(void);
242243
extern void shim_fini(void);
243-
extern EFI_STATUS EFIAPI LogError_(const char *file, int line, const char *func,
244-
const CHAR16 *fmt, ...);
245-
extern EFI_STATUS EFIAPI VLogError(const char *file, int line, const char *func,
246-
const CHAR16 *fmt, ms_va_list args);
247-
extern VOID LogHexdump_(const char *file, int line, const char *func,
248-
const void *data, size_t sz);
249-
extern VOID PrintErrors(VOID);
250-
extern VOID ClearErrors(VOID);
251244
extern VOID restore_loaded_image(VOID);
252245
extern EFI_STATUS start_image(EFI_HANDLE image_handle, CHAR16 *ImagePath);
253246
extern EFI_STATUS import_mok_state(EFI_HANDLE image_handle);

0 commit comments

Comments
 (0)