From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Mon, 25 Jul 2022 07:49:39 +0000 (+0200)
Subject: boot: a couple of tweaks recommended by Coccinelle
X-Git-Tag: v252-rc1~587
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05abe850330fdef145d8d45d5a2e33d76a0a8d21;p=thirdparty%2Fsystemd.git

boot: a couple of tweaks recommended by Coccinelle
---

diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index c09c305b3f3..7470157ecd5 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -872,7 +872,7 @@ static int copy_one_file(const char *esp_path, const char *name, bool force) {
                                        "Failed to resolve path %s%s%s: %m",
                                        p,
                                        root ? " under directory " : "",
-                                       root ?: "");
+                                       strempty(root));
 
         q = path_join("/EFI/systemd/", dest_name);
         if (!q)
@@ -918,7 +918,7 @@ static int install_binaries(const char *esp_path, const char *arch, bool force)
         if (r == -ENOENT && root && arg_install_source == ARG_INSTALL_SOURCE_AUTO)
                 r = chase_symlinks_and_opendir(BOOTLIBDIR, NULL, CHASE_PREFIX_ROOT, &path, &d);
         if (r < 0)
-                return log_error_errno(r, "Failed to open boot loader directory %s%s: %m", root ?: "", BOOTLIBDIR);
+                return log_error_errno(r, "Failed to open boot loader directory %s%s: %m", strempty(root), BOOTLIBDIR);
 
         const char *suffix = strjoina(arch, ".efi");
         const char *suffix_signed = strjoina(arch, ".efi.signed");
diff --git a/src/shared/find-esp.c b/src/shared/find-esp.c
index 87ac9d167ef..14c1ce0b45c 100644
--- a/src/shared/find-esp.c
+++ b/src/shared/find-esp.c
@@ -416,7 +416,7 @@ int find_esp_and_warn(
                                                "Failed to resolve path %s%s%s: %m",
                                                path,
                                                root ? " under directory " : "",
-                                               root ?: "");
+                                               strempty(root));
 
                 r = verify_esp(p, ret_part, ret_pstart, ret_psize, ret_uuid, ret_devid, flags);
                 if (r < 0)
@@ -435,7 +435,7 @@ int find_esp_and_warn(
                                                "Failed to resolve path %s%s%s: %m",
                                                path,
                                                root ? " under directory " : "",
-                                               root ?: "");
+                                               strempty(root));
 
                 if (!path_is_valid(p) || !path_is_absolute(p))
                         return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
@@ -474,7 +474,7 @@ int find_esp_and_warn(
                                                "Failed to resolve path %s%s%s: %m",
                                                dir,
                                                root ? " under directory " : "",
-                                               root ?: "");
+                                               strempty(root));
 
                 r = verify_esp(p, ret_part, ret_pstart, ret_psize, ret_uuid, ret_devid,
                                flags | VERIFY_ESP_SEARCHING);
@@ -712,7 +712,7 @@ int find_xbootldr_and_warn(
                                                "Failed to resolve path %s%s%s: %m",
                                                path,
                                                root ? " under directory " : "",
-                                               root ?: "");
+                                               strempty(root));
 
                 r = verify_xbootldr(p, /* searching= */ false, unprivileged_mode, ret_uuid, ret_devid);
                 if (r < 0)
@@ -731,7 +731,7 @@ int find_xbootldr_and_warn(
                                                "Failed to resolve path %s%s%s: %m",
                                                path,
                                                root ? " under directory " : "",
-                                               root ?: "");
+                                               strempty(root));
 
                 if (!path_is_valid(p) || !path_is_absolute(p))
                         return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
@@ -758,7 +758,7 @@ int find_xbootldr_and_warn(
                 return log_error_errno(r,
                                        "Failed to resolve path /boot%s%s: %m",
                                        root ? " under directory " : "",
-                                       root ?: "");
+                                       strempty(root));
 
         r = verify_xbootldr(p, true, unprivileged_mode, ret_uuid, ret_devid);
         if (r >= 0)