SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Define array cleanup funcs through macros (#41559)

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2026-04-10 21:45:14 +02:00
committed by GitHub
parent 6b1a59d594 79f90f4ae0
commit 5cd61c1330
43 changed files with 136 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/boot/stub.c
+4 -11
View File
@@ -412,14 +412,7 @@ static void named_addon_done(NamedAddon *a) {
iovec_done(&a->blob);
}
static void named_addon_free_many(NamedAddon *a, size_t n) {
assert(a || n == 0);
FOREACH_ARRAY(i, a, n)
named_addon_done(i);
free(a);
}
static DEFINE_ARRAY_FREE_FUNC(named_addon_free_array, NamedAddon, named_addon_done);
static void install_addon_devicetrees(
struct devicetree_state *dt_state,
@@ -1294,9 +1287,9 @@ static EFI_STATUS run(EFI_HANDLE image) {
/* Now that we have the UKI sections loaded, also load global first and then local (per-UKI)
* addons. The data is loaded at once, and then used later. */
CLEANUP_ARRAY(dt_addons, n_dt_addons, named_addon_free_many);
CLEANUP_ARRAY(initrd_addons, n_initrd_addons, named_addon_free_many);
CLEANUP_ARRAY(ucode_addons, n_ucode_addons, named_addon_free_many);
CLEANUP_ARRAY(dt_addons, n_dt_addons, named_addon_free_array);
CLEANUP_ARRAY(initrd_addons, n_initrd_addons, named_addon_free_array);
CLEANUP_ARRAY(ucode_addons, n_ucode_addons, named_addon_free_array);
load_all_addons(image, loaded_image, uname, &cmdline_addons, &dt_addons, &n_dt_addons, &initrd_addons, &n_initrd_addons, &ucode_addons, &n_ucode_addons);
/* If we have any extra command line to add via PE addons, load them now and append, and measure the