From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 22 Nov 2019 14:22:40 +0000 (+0100)
Subject: journald: let's use TAKE_PTR() and TAKE_FD() where appropriate
X-Git-Tag: v245-rc1~41^2~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e7ef3bfb2832373aff615c1bbf2b246cbe795ca;p=thirdparty%2Fsystemd.git

journald: let's use TAKE_PTR() and TAKE_FD() where appropriate
---

diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
index 098ee96e79d..4f756b3b926 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -631,8 +631,7 @@ int stdout_stream_install(Server *s, int fd, StdoutStream **ret) {
         if (ret)
                 *ret = stream;
 
-        stream = NULL;
-
+        TAKE_PTR(stream);
         return 0;
 }
 
@@ -675,7 +674,7 @@ static int stdout_stream_new(sd_event_source *es, int listen_fd, uint32_t revent
         if (r < 0)
                 return r;
 
-        fd = -1;
+        TAKE_FD(fd);
         return 0;
 }