From 8e8df8292a898ef8f4ac9107a45e86c83fbb3178 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 17 Mar 2023 12:46:51 +0900 Subject: [PATCH] exec-util: tighten variable scope a bit --- src/shared/exec-util.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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"); -- 2.47.3