From: Jan Janssen <medhefgo@web.de>
Date: Tue, 26 Oct 2021 10:17:31 +0000 (+0200)
Subject: sd-boot: Use FLAGS_SET
X-Git-Tag: v250-rc1~355^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=785b5fcf5f692a1b3788cee2fb0f076ca78572c0;p=thirdparty%2Fsystemd.git

sd-boot: Use FLAGS_SET
---

diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c
index db0c22d405b..b2b763beee1 100644
--- a/src/boot/efi/boot.c
+++ b/src/boot/efi/boot.c
@@ -551,7 +551,7 @@ static EFI_STATUS reboot_into_firmware(void) {
         UINT64 osind = 0;
         EFI_STATUS err;
 
-        if (!(get_os_indications_supported() & EFI_OS_INDICATIONS_BOOT_TO_FW_UI))
+        if (!FLAGS_SET(get_os_indications_supported(), EFI_OS_INDICATIONS_BOOT_TO_FW_UI))
                 return log_error_status_stall(EFI_UNSUPPORTED, L"Reboot to firmware interface not supported.");
 
         (void) efivar_get_uint64_le(EFI_GLOBAL_GUID, L"OsIndications", &osind);
@@ -924,7 +924,7 @@ static BOOLEAN menu_run(
                 case KEYPRESS(0, SCAN_F10, 0):    /* HP and Lenovo. */
                 case KEYPRESS(0, SCAN_DELETE, 0): /* Same as F2. */
                 case KEYPRESS(0, SCAN_ESC, 0):    /* HP. */
-                        if (get_os_indications_supported() & EFI_OS_INDICATIONS_BOOT_TO_FW_UI) {
+                        if (FLAGS_SET(get_os_indications_supported(), EFI_OS_INDICATIONS_BOOT_TO_FW_UI)) {
                                 firmware_setup = TRUE;
                                 /* Let's make sure the user really wants to do this. */
                                 status = PoolPrint(L"Press Enter to reboot into firmware interface.");
@@ -1590,7 +1590,7 @@ static void config_load_entries(
 
                 if (f->FileName[0] == '.')
                         continue;
-                if (f->Attribute & EFI_FILE_DIRECTORY)
+                if (FLAGS_SET(f->Attribute, EFI_FILE_DIRECTORY))
                         continue;
 
                 if (!endswith_no_case(f->FileName, L".conf"))
@@ -2046,7 +2046,7 @@ static void config_entry_add_linux(
 
                 if (f->FileName[0] == '.')
                         continue;
-                if (f->Attribute & EFI_FILE_DIRECTORY)
+                if (FLAGS_SET(f->Attribute, EFI_FILE_DIRECTORY))
                         continue;
                 if (!endswith_no_case(f->FileName, L".efi"))
                         continue;
@@ -2352,7 +2352,7 @@ static void config_load_all_entries(
         config_entry_add_loader_auto(config, loaded_image->DeviceHandle, root_dir, loaded_image_path,
                                      L"auto-efi-default", '\0', L"EFI Default Loader", NULL);
 
-        if (config->auto_firmware && (get_os_indications_supported() & EFI_OS_INDICATIONS_BOOT_TO_FW_UI))
+        if (config->auto_firmware && FLAGS_SET(get_os_indications_supported(), EFI_OS_INDICATIONS_BOOT_TO_FW_UI))
                 config_entry_add_call(config,
                                       L"auto-reboot-to-firmware-setup",
                                       L"Reboot Into Firmware Interface",
diff --git a/src/boot/efi/cpio.c b/src/boot/efi/cpio.c
index bb7c988031e..1818fbedd08 100644
--- a/src/boot/efi/cpio.c
+++ b/src/boot/efi/cpio.c
@@ -375,7 +375,7 @@ EFI_STATUS pack_cpio(
 
                 if (dirent->FileName[0] == '.')
                         continue;
-                if (dirent->Attribute & EFI_FILE_DIRECTORY)
+                if (FLAGS_SET(dirent->Attribute, EFI_FILE_DIRECTORY))
                         continue;
                 if (match_suffix && !endswith_no_case(dirent->FileName, match_suffix))
                         continue;
diff --git a/src/boot/efi/drivers.c b/src/boot/efi/drivers.c
index 3ae8f0dde7c..4bb4dedaa04 100644
--- a/src/boot/efi/drivers.c
+++ b/src/boot/efi/drivers.c
@@ -103,7 +103,7 @@ EFI_STATUS load_drivers(
 
                 if (dirent->FileName[0] == '.')
                         continue;
-                if (dirent->Attribute & EFI_FILE_DIRECTORY)
+                if (FLAGS_SET(dirent->Attribute, EFI_FILE_DIRECTORY))
                         continue;
                 if (!endswith_no_case(dirent->FileName, EFI_MACHINE_TYPE_NAME L".efi"))
                         continue;
diff --git a/src/boot/efi/util.c b/src/boot/efi/util.c
index eb9745ce27d..4d981ca7e57 100644
--- a/src/boot/efi/util.c
+++ b/src/boot/efi/util.c
@@ -741,7 +741,7 @@ EFI_STATUS open_directory(
         err = get_file_info_harder(dir, &file_info, NULL);
         if (EFI_ERROR(err))
                 return err;
-        if (!(file_info->Attribute & EFI_FILE_DIRECTORY))
+        if (!FLAGS_SET(file_info->Attribute, EFI_FILE_DIRECTORY))
                 return EFI_LOAD_ERROR;
 
         *ret = TAKE_PTR(dir);