boot: rename efifirmware.[ch] -> efi-firmware.[ch]

This also
- renames efifirmware_match_by_fwid() -> efi_firmware_match_by_fwid(),
- drops unnecessary wrapper efifw_get_fwid(),
- drops unnecessary inclusion of header <endian.h>,
- sort files in meson.build.

No functional change, just refactoring and follow-ups for
83bf58f39dbe947c1b4f394667f42a0c557fd94c.

diff --git a/src/boot/efifirmware.c b/src/boot/efi-firmware.c
similarity index 73%
rename from src/boot/efifirmware.c
rename to src/boot/efi-firmware.c
index 8cf8e622ca29398305d61faa1d4f285e5f717962..01bb2c2c7154c0f121e1c21181a7a0add0f19d6b 100644 (file)
--- a/src/boot/efifirmware.c
+++ b/src/boot/efi-firmware.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "efifirmware.h"
+#include "efi-firmware.h"
 #include "util.h"
-#include <endian.h>
 
 static bool efifw_validate_header(
                 const void *blob,
@@ -43,7 +42,7 @@ static bool efifw_validate_header(
         if (blob_len < total_computed_size)
                 return false;
 
-        const char *fwid    = (const char*)blob + header_len;
+        const char *fwid    = (const char*) blob + header_len;
         const char *payload = fwid + fwid_len;
 
         /* check that fwid points to a NUL terminated string */
@@ -58,27 +57,17 @@ static bool efifw_validate_header(
         return true;
 }
 
-static const char* efifw_get_fwid(
-                const void *efifwblob,
-                size_t efifwblob_len) {
-
-        const char* fwid;
-        if (!efifw_validate_header(efifwblob, efifwblob_len, &fwid, NULL))
-                return NULL;
-
-        return fwid;
-}
-
-EFI_STATUS efifirmware_match_by_fwid(
-                const void *uki_efifw,
-                size_t uki_efifw_len,
+EFI_STATUS efi_firmware_match_by_fwid(
+                const void *blob,
+                size_t blob_len,
                 const char *fwid) {
 
+        assert(blob);
         assert(fwid);
 
-        const char *fwblob_fwid = efifw_get_fwid(uki_efifw, uki_efifw_len);
-        if (!fwblob_fwid)
+        const char *blob_fwid;
+        if (!efifw_validate_header(blob, blob_len, &blob_fwid, NULL))
                 return EFI_INVALID_PARAMETER;
 
-        return streq8(fwblob_fwid, fwid) ? EFI_SUCCESS : EFI_NOT_FOUND;
+        return streq8(blob_fwid, fwid) ? EFI_SUCCESS : EFI_NOT_FOUND;
 }

diff --git a/src/boot/efifirmware.h b/src/boot/efi-firmware.h
similarity index 92%
rename from src/boot/efifirmware.h
rename to src/boot/efi-firmware.h
index 888de35a9834be1924015dea27f6293c2ed3ce9e..9901d7d5c02e00cf55353622c696be00e58b3b4a 100644 (file)
--- a/src/boot/efifirmware.h
+++ b/src/boot/efi-firmware.h
@@ -28,4 +28,4 @@ typedef struct EfiFwHeader {
         uint8_t payload[] _alignas_(uint64_t);
 } EfiFwHeader;
 
-EFI_STATUS efifirmware_match_by_fwid(const void *uki_efifw, size_t uki_efifw_length, const char *fwid);
+EFI_STATUS efi_firmware_match_by_fwid(const void *blob, size_t blob_len, const char *fwid);

diff --git a/src/boot/meson.build b/src/boot/meson.build
index 31f36ea46d45b8762da5826dccb47fd4f315422f..3a17ab5ed0f6ea937bb92fc05cc7aa7446f21fa4 100644 (file)
--- a/src/boot/meson.build
+++ b/src/boot/meson.build
@@ -284,8 +284,8 @@ libefi_sources = files(
         'console.c',
         'device-path-util.c',
         'devicetree.c',
-        'efifirmware.c',
         'drivers.c',
+        'efi-firmware.c',
         'efi-string.c',
         'efivars.c',
         'export-vars.c',

diff --git a/src/boot/pe.c b/src/boot/pe.c
index 348296f001685b3efe3ac39ef48c18b36f70fa16..04139c7ff680007280e950ba060372022992174e 100644 (file)
--- a/src/boot/pe.c
+++ b/src/boot/pe.c
@@ -2,7 +2,7 @@
 
 #include "chid.h"
 #include "devicetree.h"
-#include "efifirmware.h"
+#include "efi-firmware.h"
 #include "pe.h"
 #include "util.h"
 
@@ -215,7 +215,7 @@ static bool pe_use_this_firmware(
         if (!fwid)
                 return false;
 
-        err = efifirmware_match_by_fwid(efifw, efifw_size, fwid);
+        err = efi_firmware_match_by_fwid(efifw, efifw_size, fwid);
         if (err == EFI_SUCCESS)
                 return true;
         if (err == EFI_INVALID_PARAMETER)