Make show_boot_vars use efivars DP formatting code.

Signed-off-by: Peter Jones <pjones@redhat.com>

diff --git a/Makefile b/Makefile
index dc11f31..f41fd1d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,8 @@
   RELEASE_STRING := $(RELEASE_NAME)-$(RELEASE_MAJOR).$(RELEASE_MINOR).$(RELEASE_SUBLEVEL)
 
   CFLAGS = $(EXTRA_CFLAGS) -DEFIBOOTMGR_VERSION=\"$(RELEASE_MAJOR).$(RELEASE_MINOR).$(RELEASE_SUBLEVEL)\" \
-           -Wsign-compare -Wall -Werror -g -D_FILE_OFFSET_BITS=64
+           -Wsign-compare -Wall -Werror -g -D_FILE_OFFSET_BITS=64 \
+           -I/usr/include/efivar
 
   MODULES := src
 

diff --git a/src/efibootmgr/efibootmgr.c b/src/efibootmgr/efibootmgr.c
index 9f1636a..8dde430 100644 (file)
--- a/src/efibootmgr/efibootmgr.c
+++ b/src/efibootmgr/efibootmgr.c
@@ -579,7 +579,7 @@ set_var_nums(list_t *list)
 }
 
 static void
-unparse_boot_order(uint16_t *order, int length)
+print_boot_order(uint16_t *order, int length)
 {
        int i;
        printf("BootOrder: ");
@@ -813,8 +813,9 @@ show_boot_vars()
                        size_t text_path_len = 0;
                        ssize_t rc;
 
-                       rc = unparse_path(text_path, text_path_len, path,
-                                    load_option->file_path_list_length);
+                       rc = efidp_format_device_path(text_path, text_path_len,
+                                                     (const_efidp)path,
+                                                     load_option->file_path_list_length);
                        if (rc < 0) {
                                fprintf(stderr, "Could not parse device path: %m\n");
                                exit(1);
@@ -827,8 +828,10 @@ show_boot_vars()
                                fprintf(stderr, "Could not parse device path: %m\n");
                                exit(1);
                        }
-                       rc = unparse_path(text_path, text_path_len,
-                               path, load_option->file_path_list_length);
+
+                       rc = efidp_format_device_path(text_path, text_path_len,
+                                                     (const_efidp)path,
+                                                     load_option->file_path_list_length);
                        if (rc < 0) {
                                fprintf(stderr, "Could not parse device path: %m\n");
                                exit(1);
@@ -899,7 +902,7 @@ show_boot_order()
        */
        data = (uint16_t *)boot_order->data;
        if (boot_order->data_size) {
-               unparse_boot_order(data, boot_order->data_size / sizeof(uint16_t));
+               print_boot_order(data, boot_order->data_size / sizeof(uint16_t));
                free(boot_order->data);
        }
        free(boot_order);