From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 21 Sep 2021 13:13:29 +0000 (+0200)
Subject: boot: port more code to use open_directory() helper
X-Git-Tag: v250-rc1~629^2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=77c015820c04a9a0562487f6ef8ffd8a5dcef601;p=thirdparty%2Fsystemd.git

boot: port more code to use open_directory() helper
---

diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c
index f1777d8de0b..dd7731c4da3 100644
--- a/src/boot/efi/boot.c
+++ b/src/boot/efi/boot.c
@@ -1498,7 +1498,7 @@ static VOID config_load_entries(
         assert(root_dir);
         assert(loaded_image_path);
 
-        err = uefi_call_wrapper(root_dir->Open, 5, root_dir, &entries_dir, (CHAR16*) L"\\loader\\entries", EFI_FILE_MODE_READ, 0ULL);
+        err = open_directory(root_dir, L"\\loader\\entries", &entries_dir);
         if (EFI_ERROR(err))
                 return;
 
@@ -1969,7 +1969,7 @@ static VOID config_entry_add_linux(
         assert(device);
         assert(root_dir);
 
-        err = uefi_call_wrapper(root_dir->Open, 5, root_dir, &linux_dir, (CHAR16*) L"\\EFI\\Linux", EFI_FILE_MODE_READ, 0ULL);
+        err = open_directory(root_dir, L"\\EFI\\Linux", &linux_dir);
         if (EFI_ERROR(err))
                 return;