From 156ccbc3c4581a1e6d29c51f4af4e120e30a2ef0 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 23 Jan 2022 12:55:12 -0700 Subject: efi: Use 16-bit unicode strings At present we use wide characters for unicode but this is not necessary. Change the code to use the 'u' literal instead. This helps to fix build warnings for sandbox on rpi. Signed-off-by: Simon Glass Suggested-by: Heinrich Schuchardt Reviewed-by: Heinrich Schuchardt --- lib/efi_selftest/efi_selftest_textoutput.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/efi_selftest/efi_selftest_textoutput.c') diff --git a/lib/efi_selftest/efi_selftest_textoutput.c b/lib/efi_selftest/efi_selftest_textoutput.c index 450fe97e62..cc44b38bc2 100644 --- a/lib/efi_selftest/efi_selftest_textoutput.c +++ b/lib/efi_selftest/efi_selftest_textoutput.c @@ -44,14 +44,14 @@ static int execute(void) } /* TestString */ ret = con_out->test_string(con_out, - L" !\"#$%&'()*+,-./0-9:;<=>?@A-Z[\\]^_`a-z{|}~\n"); + u" !\"#$%&'()*+,-./0-9:;<=>?@A-Z[\\]^_`a-z{|}~\n"); if (ret != EFI_ST_SUCCESS) { efi_st_error("TestString failed for ANSI characters\n"); return EFI_ST_FAILURE; } /* OutputString */ ret = con_out->output_string(con_out, - L"Testing cursor column update\n"); + u"Testing cursor column update\n"); if (ret != EFI_ST_SUCCESS) { efi_st_error("OutputString failed for ANSI characters"); return EFI_ST_FAILURE; @@ -75,7 +75,7 @@ static int execute(void) efi_st_error("Cursor column not 0 at beginning of line\n"); return EFI_ST_FAILURE; } - ret = con_out->output_string(con_out, L"123"); + ret = con_out->output_string(con_out, u"123"); if (ret != EFI_ST_SUCCESS) { efi_st_error("OutputString failed for ANSI characters\n"); return EFI_ST_FAILURE; @@ -84,7 +84,7 @@ static int execute(void) efi_st_error("Cursor column not incremented properly\n"); return EFI_ST_FAILURE; } - ret = con_out->output_string(con_out, L"\b"); + ret = con_out->output_string(con_out, u"\b"); if (ret != EFI_ST_SUCCESS) { efi_st_error("OutputString failed for backspace\n"); return EFI_ST_FAILURE; @@ -93,7 +93,7 @@ static int execute(void) efi_st_error("Cursor column not decremented properly\n"); return EFI_ST_FAILURE; } - ret = con_out->output_string(con_out, L"\b\b"); + ret = con_out->output_string(con_out, u"\b\b"); if (ret != EFI_ST_SUCCESS) { efi_st_error("OutputString failed for backspace\n"); return EFI_ST_FAILURE; @@ -102,7 +102,7 @@ static int execute(void) efi_st_error("Cursor column not decremented properly\n"); return EFI_ST_FAILURE; } - ret = con_out->output_string(con_out, L"\b\b"); + ret = con_out->output_string(con_out, u"\b\b"); if (ret != EFI_ST_SUCCESS) { efi_st_error("OutputString failed for backspace\n"); return EFI_ST_FAILURE; -- cgit v1.2.3