From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 22 Sep 2015 23:05:55 +0000 (+0200)
Subject: tree-wide: take benefit of the fact that fdset_free() returns NULL
X-Git-Tag: v227~62^2~50
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2feceb5eb945d430999a8130e14c512af35b21d9;p=thirdparty%2Fsystemd.git

tree-wide: take benefit of the fact that fdset_free() returns NULL
---

diff --git a/src/core/main.c b/src/core/main.c
index 3ba92e1779f..815dbe7bd4e 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1632,8 +1632,7 @@ int main(int argc, char *argv[]) {
 
         /* This will close all file descriptors that were opened, but
          * not claimed by any unit. */
-        fdset_free(fds);
-        fds = NULL;
+        fds = fdset_free(fds);
 
         arg_serialization = safe_fclose(arg_serialization);
 
@@ -1880,11 +1879,7 @@ finish:
                  * but let's hope that doesn't matter.) */
 
                 arg_serialization = safe_fclose(arg_serialization);
-
-                if (fds) {
-                        fdset_free(fds);
-                        fds = NULL;
-                }
+                fds = fdset_free(fds);
 
                 /* Reopen the console */
                 make_console_stdio();
@@ -1920,11 +1915,7 @@ finish:
         }
 
         arg_serialization = safe_fclose(arg_serialization);
-
-        if (fds) {
-                fdset_free(fds);
-                fds = NULL;
-        }
+        fds = fdset_free(fds);
 
 #ifdef HAVE_VALGRIND_VALGRIND_H
         /* If we are PID 1 and running under valgrind, then let's exit
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index f4721a1c29e..cb4e87fd74c 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -3338,8 +3338,7 @@ int main(int argc, char *argv[]) {
 
                 barrier_set_role(&barrier, BARRIER_PARENT);
 
-                fdset_free(fds);
-                fds = NULL;
+                fds = fdset_free(fds);
 
                 kmsg_socket_pair[1] = safe_close(kmsg_socket_pair[1]);
                 rtnl_socket_pair[1] = safe_close(rtnl_socket_pair[1]);