| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 1 | From 07f080184d067c1ebc3fec1b53dd4a06d1a2566a Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex@linutronix.de> |
| 3 | Date: Mon, 17 Jan 2022 23:24:34 +0100 |
| 4 | Subject: [PATCH] src: make compatible with efivar 38 |
| 5 | |
| 6 | Upstream-Status: Backport |
| 7 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
| 8 | --- |
| 9 | src/efibootdump.c | 2 +- |
| 10 | src/efibootmgr.c | 4 ++-- |
| 11 | 2 files changed, 3 insertions(+), 3 deletions(-) |
| 12 | |
| 13 | diff --git a/src/efibootdump.c b/src/efibootdump.c |
| 14 | index eceffd6..09bd76e 100644 |
| 15 | --- a/src/efibootdump.c |
| 16 | +++ b/src/efibootdump.c |
| 17 | @@ -69,7 +69,7 @@ print_boot_entry(efi_load_option *loadopt, size_t data_size) |
| 18 | text_path = alloca(text_path_len); |
| 19 | if (!text_path) |
| 20 | error(100, "Couldn't allocate memory"); |
| 21 | - rc = efidp_format_device_path(text_path, text_path_len, |
| 22 | + rc = efidp_format_device_path((unsigned char *)text_path, text_path_len, |
| 23 | dp, pathlen); |
| 24 | if (rc < 0) { |
| 25 | printf("<bad device path>"); |
| 26 | diff --git a/src/efibootmgr.c b/src/efibootmgr.c |
| 27 | index 4e1a680..b77b1fb 100644 |
| 28 | --- a/src/efibootmgr.c |
| 29 | +++ b/src/efibootmgr.c |
| 30 | @@ -949,7 +949,7 @@ show_vars(const char *prefix) |
| 31 | pathlen = efi_loadopt_pathlen(load_option, |
| 32 | boot->data_size); |
| 33 | dp = efi_loadopt_path(load_option, boot->data_size); |
| 34 | - rc = efidp_format_device_path(text_path, text_path_len, |
| 35 | + rc = efidp_format_device_path((unsigned char *)text_path, text_path_len, |
| 36 | dp, pathlen); |
| 37 | if (rc < 0) |
| 38 | error(18, "Could not parse device path"); |
| 39 | @@ -960,7 +960,7 @@ show_vars(const char *prefix) |
| 40 | if (!text_path) |
| 41 | error(19, "Could not parse device path"); |
| 42 | |
| 43 | - rc = efidp_format_device_path(text_path, text_path_len, |
| 44 | + rc = efidp_format_device_path((unsigned char *)text_path, text_path_len, |
| 45 | dp, pathlen); |
| 46 | if (rc < 0) |
| 47 | error(20, "Could not parse device path"); |