From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 1 Mar 2019 16:51:15 +0000 (+0100)
Subject: bootspec: simplify find_default_boot_entry()
X-Git-Tag: v242-rc1~192^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b1da1ba6da432dc6b120f4ad438aa4a360b2df7;p=thirdparty%2Fsystemd.git

bootspec: simplify find_default_boot_entry()

If the only caller passes NULL for the two paths, let's remove the
parameter altogether.
---

diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c
index ae20b34a407..d5bd0ff75e1 100644
--- a/src/shared/bootspec.c
+++ b/src/shared/bootspec.c
@@ -1295,8 +1295,6 @@ found:
 }
 
 int find_default_boot_entry(
-                const char *esp_path,
-                const char *xbootldr_path,
                 BootConfig *config,
                 const BootEntry **e) {
 
@@ -1306,13 +1304,13 @@ int find_default_boot_entry(
         assert(config);
         assert(e);
 
-        r = find_esp_and_warn(esp_path, false, &esp_where, NULL, NULL, NULL, NULL);
+        r = find_esp_and_warn(NULL, false, &esp_where, NULL, NULL, NULL, NULL);
         if (r == -ENOKEY) /* find_esp_and_warn() doesn't warn about this case */
                 return log_error_errno(r, "Cannot find the ESP partition mount point.");
         if (r < 0) /* But it logs about all these cases, hence don't log here again */
                 return r;
 
-        r = find_xbootldr_and_warn(xbootldr_path, false, &xbootldr_where, NULL);
+        r = find_xbootldr_and_warn(NULL, false, &xbootldr_where, NULL);
         if (r < 0 && r != -ENOKEY)
                 return r;
 
diff --git a/src/shared/bootspec.h b/src/shared/bootspec.h
index f1849025586..695e86d8f7b 100644
--- a/src/shared/bootspec.h
+++ b/src/shared/bootspec.h
@@ -50,4 +50,4 @@ static inline const char* boot_entry_title(const BootEntry *entry) {
 int find_esp_and_warn(const char *path, bool unprivileged_mode, char **ret_path, uint32_t *ret_part, uint64_t *ret_pstart, uint64_t *ret_psize, sd_id128_t *ret_uuid);
 int find_xbootldr_and_warn(const char *path, bool unprivileged_mode, char **ret_path,sd_id128_t *ret_uuid);
 
-int find_default_boot_entry(const char *esp_path, const char *xbootldr_path, BootConfig *config, const BootEntry **e);
+int find_default_boot_entry(BootConfig *config, const BootEntry **e);
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 0b31a4c9da8..d88435f8e97 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -3535,7 +3535,7 @@ static int load_kexec_kernel(void) {
         if (access(KEXEC, X_OK) < 0)
                 return log_error_errno(errno, KEXEC" is not available: %m");
 
-        r = find_default_boot_entry(NULL, NULL, &config, &e);
+        r = find_default_boot_entry(&config, &e);
         if (r < 0)
                 return r;