shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-08 11:27:32 +03:00
Code

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

Browse Source
This commit is contained in:
Lennart Poettering 2015-09-23 01:05:55 +02:00
parent 3dfc97634e
commit 2feceb5eb9
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/main.c
View File

@ -1632,8 +1632,7 @@ int main(int argc, char *argv[]) {
/* This will close all file descriptors that were opened, but /* This will close all file descriptors that were opened, but
* not claimed by any unit. */ * not claimed by any unit. */
fdset_free(fds); fds = fdset_free(fds);
fds = NULL;
arg_serialization = safe_fclose(arg_serialization); arg_serialization = safe_fclose(arg_serialization);
@ -1880,11 +1879,7 @@ finish:
* but let's hope that doesn't matter.) */ * but let's hope that doesn't matter.) */
arg_serialization = safe_fclose(arg_serialization); arg_serialization = safe_fclose(arg_serialization);
fds = fdset_free(fds);
if (fds) {
fdset_free(fds);
fds = NULL;
}
/* Reopen the console */ /* Reopen the console */
make_console_stdio(); make_console_stdio();
@ -1920,11 +1915,7 @@ finish:
} }
arg_serialization = safe_fclose(arg_serialization); arg_serialization = safe_fclose(arg_serialization);
fds = fdset_free(fds);
if (fds) {
fdset_free(fds);
fds = NULL;
}
#ifdef HAVE_VALGRIND_VALGRIND_H #ifdef HAVE_VALGRIND_VALGRIND_H
/* If we are PID 1 and running under valgrind, then let's exit /* If we are PID 1 and running under valgrind, then let's exit

3
src/nspawn/nspawn.c
View File

@ -3338,8 +3338,7 @@ int main(int argc, char *argv[]) {
barrier_set_role(&barrier, BARRIER_PARENT); barrier_set_role(&barrier, BARRIER_PARENT);
fdset_free(fds); fds = fdset_free(fds);
fds = NULL;
kmsg_socket_pair[1] = safe_close(kmsg_socket_pair[1]); kmsg_socket_pair[1] = safe_close(kmsg_socket_pair[1]);
rtnl_socket_pair[1] = safe_close(rtnl_socket_pair[1]); rtnl_socket_pair[1] = safe_close(rtnl_socket_pair[1]);