Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-27 07:51:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

efi_loader: simplify show_efi_boot_opt_data()

Browse source 
To print a UTF-16 string use %ls instead of converting string to UTF-8.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
This commit is contained in:
Heinrich Schuchardt 2021-05-24 10:35:25 +02:00
parent 9a6b33bef2
commit cd5a87e7b7
1 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cmd/efidebug.c
View file

@ -1147,8 +1147,6 @@ static void show_efi_boot_opt_data(u16 *varname16, void *data, size_t *size)
{ {
struct efi_device_path *initrd_path = NULL; struct efi_device_path *initrd_path = NULL;
struct efi_load_option lo; struct efi_load_option lo;
char *label, *p;
size_t label_len16, label_len;
u16 *dp_str; u16 *dp_str;
efi_status_t ret; efi_status_t ret;
efi_uintn_t initrd_dp_size; efi_uintn_t initrd_dp_size;
@ -1160,14 +1158,6 @@ static void show_efi_boot_opt_data(u16 *varname16, void *data, size_t *size)
return; return;
} }
label_len16 = u16_strlen(lo.label);
label_len = utf16_utf8_strnlen(lo.label, label_len16);
label = malloc(label_len + 1);
if (!label)
return;
p = label;
utf16_utf8_strncpy(&p, lo.label, label_len16);
printf("%ls:\nattributes: %c%c%c (0x%08x)\n", printf("%ls:\nattributes: %c%c%c (0x%08x)\n",
varname16, varname16,
/* ACTIVE */ /* ACTIVE */
@ -1177,7 +1167,7 @@ static void show_efi_boot_opt_data(u16 *varname16, void *data, size_t *size)
/* HIDDEN */ /* HIDDEN */
lo.attributes & LOAD_OPTION_HIDDEN ? 'H' : '-', lo.attributes & LOAD_OPTION_HIDDEN ? 'H' : '-',
lo.attributes); lo.attributes);
printf(" label: %s\n", label); printf(" label: %ls\n", lo.label);
dp_str = efi_dp_str(lo.file_path); dp_str = efi_dp_str(lo.file_path);
printf(" file_path: %ls\n", dp_str); printf(" file_path: %ls\n", dp_str);
@ -1194,7 +1184,6 @@ static void show_efi_boot_opt_data(u16 *varname16, void *data, size_t *size)
printf(" data:\n"); printf(" data:\n");
print_hex_dump(" ", DUMP_PREFIX_OFFSET, 16, 1, print_hex_dump(" ", DUMP_PREFIX_OFFSET, 16, 1,
lo.optional_data, *size, true); lo.optional_data, *size, true);
free(label);
} }
/** /**