diff options
| author | Peter Jones <pjones@redhat.com> | 2019-08-26 16:12:05 -0400 |
|---|---|---|
| committer | Javier Martinez Canillas <javier@dowhile0.org> | 2021-02-16 09:12:48 +0100 |
| commit | d230d02f990f02293736dca78b108f86c86d1bd0 (patch) | |
| tree | 63126d57d10cf01fed289d766607a859bbf26808 | |
| parent | a5db51a52e8d4cae938fc807b991383309dffca7 (diff) | |
| download | efi-boot-shim-d230d02f990f02293736dca78b108f86c86d1bd0.tar.gz efi-boot-shim-d230d02f990f02293736dca78b108f86c86d1bd0.zip | |
console: Fix a typo in the EFI warning list in gnu-efi
Some versions of gnu-efi have a typo, in which "EFI_WARN_UNKNOWN_GLYPH"
is accidentally "EFI_WARN_UNKOWN_GLYPH". Work around that, so that we
can use the not-silly one in console.c's list of error and warning
messages.
This is a backport from devel for:
commit 5f62b22ccd636d326b3229a2b196118701c6f3f7
Author: Peter Jones <pjones@redhat.com>
Date: Mon Aug 26 16:12:05 2019 -0400
Signed-off-by: Peter Jones <pjones@redhat.com>
| -rw-r--r-- | include/console.h | 6 | ||||
| -rw-r--r-- | lib/console.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/console.h b/include/console.h index 63461c96..b2ab5fe4 100644 --- a/include/console.h +++ b/include/console.h @@ -9,6 +9,12 @@ #define PrintAt(fmt, ...) \ ({"Do not directly call PrintAt() use console_print_at() instead" = 1;}); +#if !defined(EFI_WARN_UNKNOWN_GLYPH) && defined(EFI_WARN_UNKOWN_GLYPH) +#define EFI_WARN_UNKNOWN_GLYPH EFI_WARN_UNKOWN_GLYPH +#elif !defined(EFI_WARN_UNKNOWN_GLYPH) +#define EFI_WARN_UNKNOWN_GLYPH EFIWARN(1) +#endif + EFI_STATUS console_get_keystroke(EFI_INPUT_KEY *key); UINTN diff --git a/lib/console.c b/lib/console.c index a1d6a840..05f7ec16 100644 --- a/lib/console.c +++ b/lib/console.c @@ -603,7 +603,7 @@ static struct { { EFI_SECURITY_VIOLATION, L"Security Violation"}, // warnings - { EFI_WARN_UNKOWN_GLYPH, L"Warning Unknown Glyph"}, + { EFI_WARN_UNKNOWN_GLYPH, L"Warning Unknown Glyph"}, { EFI_WARN_DELETE_FAILURE, L"Warning Delete Failure"}, { EFI_WARN_WRITE_FAILURE, L"Warning Write Failure"}, { EFI_WARN_BUFFER_TOO_SMALL, L"Warning Buffer Too Small"}, |