shared/bootspec: move boot_entry_addons_done() up, drop separate prototype
authorMike Yuan <me@yhndnzj.com>
Wed, 27 Nov 2024 13:43:30 +0000 (14:43 +0100)
committerMike Yuan <me@yhndnzj.com>
Wed, 27 Nov 2024 13:49:04 +0000 (14:49 +0100)
Follow-up for e2501a851e10f5279862b2bccbdd9184572cce6a

src/shared/bootspec.c

index 9c4877055ad8bb2b1b8cb70a201f2b7350382e68..db223d66947eb632623d2b08f02a055a48978da5 100644 (file)
@@ -58,7 +58,16 @@ static const char* const boot_entry_source_json_table[_BOOT_ENTRY_SOURCE_MAX] =
 
 DEFINE_STRING_TABLE_LOOKUP_TO_STRING(boot_entry_source_json, BootEntrySource);
 
-static void boot_entry_addons_done(BootEntryAddons *addons);
+static void boot_entry_addons_done(BootEntryAddons *addons) {
+        assert(addons);
+
+        FOREACH_ARRAY(addon, addons->items, addons->n_items) {
+                free(addon->cmdline);
+                free(addon->location);
+        }
+        addons->items = mfree(addons->items);
+        addons->n_items = 0;
+}
 
 static void boot_entry_free(BootEntry *entry) {
         assert(entry);
@@ -1076,17 +1085,6 @@ static int insert_boot_entry_addon(
         return 0;
 }
 
-static void boot_entry_addons_done(BootEntryAddons *addons) {
-        assert(addons);
-
-        FOREACH_ARRAY(addon, addons->items, addons->n_items) {
-                free(addon->cmdline);
-                free(addon->location);
-        }
-        addons->items = mfree(addons->items);
-        addons->n_items = 0;
-}
-
 static int boot_entries_find_unified_addons(
                 BootConfig *config,
                 int d_fd,