From: Heinrich Schuchardt <xypron.glpk@gmx.de>
Date: Mon, 5 Nov 2018 19:22:12 +0000 (+0100)
Subject: efi_loader: use u16* for UTF16 strings
X-Git-Tag: v2019.01-rc1~9^2~26
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=02c2f0298a0b53ae0b8636567265b8a612c598d1;p=oweals%2Fu-boot.git

efi_loader: use u16* for UTF16 strings

We should be consistent in the types that we use to store Unicode strings.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
---

diff --git a/include/efi_api.h b/include/efi_api.h
index e58dd0581c..aef77b6319 100644
--- a/include/efi_api.h
+++ b/include/efi_api.h
@@ -965,7 +965,7 @@ struct efi_file_info {
 	struct efi_time last_access_time;
 	struct efi_time modification_time;
 	u64 attribute;
-	s16 file_name[0];
+	u16 file_name[0];
 };
 
 struct efi_file_system_info {
diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c
index beb4fba917..128cb0a627 100644
--- a/lib/efi_loader/efi_file.c
+++ b/lib/efi_loader/efi_file.c
@@ -563,7 +563,7 @@ static efi_status_t EFIAPI efi_file_getinfo(struct efi_file_handle *file,
 		if (fh->isdir)
 			info->attribute |= EFI_FILE_DIRECTORY;
 
-		ascii2unicode((u16 *)info->file_name, filename);
+		ascii2unicode(info->file_name, filename);
 	} else if (!guidcmp(info_type, &efi_file_system_info_guid)) {
 		struct efi_file_system_info *info = buffer;
 		disk_partition_t part;