From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 18 Feb 2023 17:09:22 +0000 (+0900)
Subject: exec-util: use TAKE_FD()
X-Git-Tag: v254-rc1~1233^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ced30d69fa878b7132d818fa7cd6da163108c254;p=thirdparty%2Fsystemd.git

exec-util: use TAKE_FD()
---

diff --git a/src/shared/exec-util.c b/src/shared/exec-util.c
index 51234fd0251..2e8f5b85627 100644
--- a/src/shared/exec-util.c
+++ b/src/shared/exec-util.c
@@ -160,8 +160,7 @@ static int do_execute(
                                 if (lseek(fd, 0, SEEK_SET) < 0)
                                         return log_error_errno(errno, "Failed to seek on serialization fd: %m");
 
-                                r = callbacks[STDOUT_GENERATE](fd, callback_args[STDOUT_GENERATE]);
-                                fd = -EBADF;
+                                r = callbacks[STDOUT_GENERATE](TAKE_FD(fd), callback_args[STDOUT_GENERATE]);
                                 if (r < 0)
                                         return log_error_errno(r, "Failed to process output from %s: %m", *path);
                         }
@@ -250,8 +249,7 @@ int execute_directories(
         if (lseek(fd, 0, SEEK_SET) < 0)
                 return log_error_errno(errno, "Failed to rewind serialization fd: %m");
 
-        r = callbacks[STDOUT_CONSUME](fd, callback_args[STDOUT_CONSUME]);
-        fd = -EBADF;
+        r = callbacks[STDOUT_CONSUME](TAKE_FD(fd), callback_args[STDOUT_CONSUME]);
         if (r < 0)
                 return log_error_errno(r, "Failed to parse returned data: %m");
         return 0;