bootspec: rename type1 parsers to say "type1" explicitly in the name

This just got too confusing for me. With this change we'll now have
_unified as common suffix for stuff loading unified kernels (i.e. type
1), and _type1 as common suffix for type1 entries.

Just some renaming.

diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c
index 6238517d9f292088ee0a71d189e06823ef48afe9..448d65f7e483a5876d6e59b52bc55978e5f85f6f 100644 (file)
--- a/src/shared/bootspec.c
+++ b/src/shared/bootspec.c
@@ -40,7 +40,7 @@ static void boot_entry_free(BootEntry *entry) {
         strv_free(entry->device_tree_overlay);
 }
 
-static int boot_entry_load(
+static int boot_entry_load_type1(
                 FILE *f,
                 const char *root,
                 const char *dir,
@@ -328,7 +328,7 @@ static int config_check_inode_relevant_and_unseen(BootConfig *config, int fd, co
         return true;
 }
 
-static int boot_entries_find(
+static int boot_entries_find_type1(
                 BootConfig *config,
                 const char *root,
                 const char *dir) {
@@ -378,7 +378,7 @@ static int boot_entries_find(
                 if (!GREEDY_REALLOC0(config->entries, config->n_entries + 1))
                         return log_oom();
 
-                r = boot_entry_load(f, root, dir, de->d_name, config->entries + config->n_entries);
+                r = boot_entry_load_type1(f, root, dir, de->d_name, config->entries + config->n_entries);
                 if (r < 0)
                         continue;
 
@@ -839,7 +839,7 @@ int boot_entries_load_config(
                         return r;
 
                 p = strjoina(esp_path, "/loader/entries");
-                r = boot_entries_find(config, esp_path, p);
+                r = boot_entries_find_type1(config, esp_path, p);
                 if (r < 0)
                         return r;
 
@@ -851,7 +851,7 @@ int boot_entries_load_config(
 
         if (xbootldr_path) {
                 p = strjoina(xbootldr_path, "/loader/entries");
-                r = boot_entries_find(config, xbootldr_path, p);
+                r = boot_entries_find_type1(config, xbootldr_path, p);
                 if (r < 0)
                         return r;