efi_loader: simplify show_efi_boot_opt_data()

Use printf code %pD for printing device paths.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Heinrich Schuchardt 2021-10-15 01:47:40 +02:00
parent 0421735dd8
commit fc42b8bb75

View File

@ -1143,7 +1143,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;
u16 *dp_str;
efi_status_t ret; efi_status_t ret;
efi_uintn_t initrd_dp_size; efi_uintn_t initrd_dp_size;
const efi_guid_t lf2_initrd_guid = EFI_INITRD_MEDIA_GUID; const efi_guid_t lf2_initrd_guid = EFI_INITRD_MEDIA_GUID;
@ -1165,15 +1164,11 @@ static void show_efi_boot_opt_data(u16 *varname16, void *data, size_t *size)
lo.attributes); lo.attributes);
printf(" label: %ls\n", lo.label); printf(" label: %ls\n", lo.label);
dp_str = efi_dp_str(lo.file_path); printf(" file_path: %pD\n", lo.file_path);
printf(" file_path: %ls\n", dp_str);
efi_free_pool(dp_str);
initrd_path = efi_dp_from_lo(&lo, &initrd_dp_size, &lf2_initrd_guid); initrd_path = efi_dp_from_lo(&lo, &initrd_dp_size, &lf2_initrd_guid);
if (initrd_path) { if (initrd_path) {
dp_str = efi_dp_str(initrd_path); printf(" initrd_path: %pD\n", initrd_path);
printf(" initrd_path: %ls\n", dp_str);
efi_free_pool(dp_str);
efi_free_pool(initrd_path); efi_free_pool(initrd_path);
} }