From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 17 Mar 2023 03:46:51 +0000 (+0900)
Subject: exec-util: tighten variable scope a bit
X-Git-Tag: v254-rc1~990^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e8df8292a898ef8f4ac9107a45e86c83fbb3178;p=thirdparty%2Fsystemd.git

exec-util: tighten variable scope a bit
---

diff --git a/src/shared/exec-util.c b/src/shared/exec-util.c
index 40e9342cd52..d38bfc9e4af 100644
--- a/src/shared/exec-util.c
+++ b/src/shared/exec-util.c
@@ -203,23 +203,24 @@ int execute_directories(
                 ExecDirFlags flags) {
 
         char **dirs = (char**) directories;
-        _cleanup_free_ char *name = NULL;
         _cleanup_close_ int fd = -EBADF;
         int r;
         pid_t executor_pid;
 
         assert(!strv_isempty(dirs));
 
-        r = path_extract_filename(dirs[0], &name);
-        if (r < 0)
-                return log_error_errno(r, "Failed to extract file name from '%s': %m", dirs[0]);
-
         if (callbacks) {
                 assert(callback_args);
                 assert(callbacks[STDOUT_GENERATE]);
                 assert(callbacks[STDOUT_COLLECT]);
                 assert(callbacks[STDOUT_CONSUME]);
 
+                _cleanup_free_ char *name = NULL;
+
+                r = path_extract_filename(dirs[0], &name);
+                if (r < 0)
+                        return log_error_errno(r, "Failed to extract file name from '%s': %m", dirs[0]);
+
                 fd = open_serialization_fd(name);
                 if (fd < 0)
                         return log_error_errno(fd, "Failed to open serialization file: %m");