diff options
| -rw-r--r-- | src/core/main.c | 15 | ||||
| -rw-r--r-- | src/nspawn/nspawn.c | 3 |
2 files changed, 4 insertions, 14 deletions
diff --git a/src/core/main.c b/src/core/main.c index 3ba92e1779..815dbe7bd4 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 f4721a1c29..cb4e87fd74 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]); |