[PATCH 1/1] efi_loader: simplify show_efi_boot_opt_data()

Heinrich Schuchardt xypron.glpk at gmx.de
Fri Oct 15 01:50:58 CEST 2021


Use printf code %pD for printing device paths.

Signed-off-by: Heinrich Schuchardt <xypron.glpk at gmx.de>
---
 cmd/efidebug.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/cmd/efidebug.c b/cmd/efidebug.c
index 5235dbb7c1..70a4658012 100644
--- a/cmd/efidebug.c
+++ b/cmd/efidebug.c
@@ -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_load_option lo;
-	u16 *dp_str;
 	efi_status_t ret;
 	efi_uintn_t initrd_dp_size;
 	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);
 	printf("  label: %ls\n", lo.label);

-	dp_str = efi_dp_str(lo.file_path);
-	printf("  file_path: %ls\n", dp_str);
-	efi_free_pool(dp_str);
+	printf("  file_path: %pD\n", lo.file_path);

 	initrd_path = efi_dp_from_lo(&lo, &initrd_dp_size, &lf2_initrd_guid);
 	if (initrd_path) {
-		dp_str = efi_dp_str(initrd_path);
-		printf("  initrd_path: %ls\n", dp_str);
-		efi_free_pool(dp_str);
+		printf("  initrd_path: %pD\n", initrd_path);
 		efi_free_pool(initrd_path);
 	}

--
2.30.2



More information about the U-Boot mailing list