commit 9097537657220de2b0899b4813148c2551a3b74f
author Simon Glass <sjg@chromium.org> Sun Jan 23 12:55:12 2022 -0700
committer Tom Rini <trini@konsulko.com> Thu Feb 03 12:16:01 2022 -0500
tree db7dcc9bb8ee0ec5730384d56356ba55a6cfd200
parent d2e6dd618aa5d34965d8afea061a9d8b0aa8ce0b

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 <sjg@chromium.org>
Suggested-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

lib/efi_selftest/efi_selftest_unicode_collation.c

diff --git a/lib/efi_selftest/efi_selftest_unicode_collation.c b/lib/efi_selftest/efi_selftest_unicode_collation.c
index 7529430..c63a1b5 100644
--- a/lib/efi_selftest/efi_selftest_unicode_collation.c
+++ b/lib/efi_selftest/efi_selftest_unicode_collation.c
@@ -44,9 +44,9 @@
 static int test_stri_coll(void)
 {
 	efi_intn_t ret;
-	u16 c1[] = L"first";
-	u16 c2[] = L"FIRST";
-	u16 c3[] = L"second";
+	u16 c1[] = u"first";
+	u16 c2[] = u"FIRST";
+	u16 c3[] = u"second";
 
 	ret = unicode_collation_protocol->stri_coll(unicode_collation_protocol,
 						    c1, c2);
@@ -78,66 +78,66 @@
 static int test_metai_match(void)
 {
 	bool ret;
-	const u16 c[] = L"Das U-Boot";
+	const u16 c[] = u"Das U-Boot";
 
 	ret = unicode_collation_protocol->metai_match(
-		unicode_collation_protocol, c, L"*");
+		unicode_collation_protocol, c, u"*");
 	if (!ret) {
 		efi_st_error("metai_match returned %u\n", ret);
 		return EFI_ST_FAILURE;
 	}
 
 	ret = unicode_collation_protocol->metai_match(
-		unicode_collation_protocol, c, L"Da[rstu] U-Boot");
+		unicode_collation_protocol, c, u"Da[rstu] U-Boot");
 	if (!ret) {
 		efi_st_error("metai_match returned %u\n", ret);
 		return EFI_ST_FAILURE;
 	}
 
 	ret = unicode_collation_protocol->metai_match(
-		unicode_collation_protocol, c, L"Da[q-v] U-Boot");
+		unicode_collation_protocol, c, u"Da[q-v] U-Boot");
 	if (!ret) {
 		efi_st_error("metai_match returned %u\n", ret);
 		return EFI_ST_FAILURE;
 	}
 
 	ret = unicode_collation_protocol->metai_match(
-		unicode_collation_protocol, c, L"Da? U-Boot");
+		unicode_collation_protocol, c, u"Da? U-Boot");
 	if (!ret) {
 		efi_st_error("metai_match returned %u\n", ret);
 		return EFI_ST_FAILURE;
 	}
 
 	ret = unicode_collation_protocol->metai_match(
-		unicode_collation_protocol, c, L"D*Bo*t");
+		unicode_collation_protocol, c, u"D*Bo*t");
 	if (!ret) {
 		efi_st_error("metai_match returned %u\n", ret);
 		return EFI_ST_FAILURE;
 	}
 
 	ret = unicode_collation_protocol->metai_match(
-		unicode_collation_protocol, c, L"Da[xyz] U-Boot");
+		unicode_collation_protocol, c, u"Da[xyz] U-Boot");
 	if (ret) {
 		efi_st_error("metai_match returned %u\n", ret);
 		return EFI_ST_FAILURE;
 	}
 
 	ret = unicode_collation_protocol->metai_match(
-		unicode_collation_protocol, c, L"Da[a-d] U-Boot");
+		unicode_collation_protocol, c, u"Da[a-d] U-Boot");
 	if (ret) {
 		efi_st_error("metai_match returned %u\n", ret);
 		return EFI_ST_FAILURE;
 	}
 
 	ret = unicode_collation_protocol->metai_match(
-		unicode_collation_protocol, c, L"Da?? U-Boot");
+		unicode_collation_protocol, c, u"Da?? U-Boot");
 	if (ret) {
 		efi_st_error("metai_match returned %u\n", ret);
 		return EFI_ST_FAILURE;
 	}
 
 	ret = unicode_collation_protocol->metai_match(
-		unicode_collation_protocol, c, L"D*Bo*tt");
+		unicode_collation_protocol, c, u"D*Bo*tt");
 	if (ret) {
 		efi_st_error("metai_match returned %u\n", ret);
 		return EFI_ST_FAILURE;
@@ -148,7 +148,7 @@
 
 static int test_str_lwr(void)
 {
-	u16 c[] = L"U-Boot";
+	u16 c[] = u"U-Boot";
 
 	unicode_collation_protocol->str_lwr(unicode_collation_protocol, c);
 	if (efi_st_strcmp_16_8(c, "u-boot")) {
@@ -161,7 +161,7 @@
 
 static int test_str_upr(void)
 {
-	u16 c[] = L"U-Boot";
+	u16 c[] = u"U-Boot";
 
 	unicode_collation_protocol->str_upr(unicode_collation_protocol, c);
 	if (efi_st_strcmp_16_8(c, "U-BOOT")) {
@@ -194,16 +194,16 @@
 
 	boottime->set_mem(fat, sizeof(fat), 0);
 	ret = unicode_collation_protocol->str_to_fat(unicode_collation_protocol,
-						     L"U -Boo.t", 6, fat);
-	if (ret || efi_st_strcmp_16_8(L"U-BOOT", fat)) {
+						     u"U -Boo.t", 6, fat);
+	if (ret || efi_st_strcmp_16_8(u"U-BOOT", fat)) {
 		efi_st_error("str_to_fat returned %u, \"%s\"\n", ret, fat);
 		return EFI_ST_FAILURE;
 	}
 
 	boottime->set_mem(fat, 16, 0);
 	ret = unicode_collation_protocol->str_to_fat(unicode_collation_protocol,
-						     L"U\\Boot", 6, fat);
-	if (!ret || efi_st_strcmp_16_8(L"U_BOOT", fat)) {
+						     u"U\\Boot", 6, fat);
+	if (!ret || efi_st_strcmp_16_8(u"U_BOOT", fat)) {
 		efi_st_error("str_to_fat returned %u, \"%s\"\n", ret, fat);
 		return EFI_ST_FAILURE;
 	}