projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
71ec74d
)
namespace-util: make use of TAKE_FD()
author
Franck Bui
<fbui@suse.com>
Fri, 7 Jun 2019 05:36:11 +0000
(07:36 +0200)
committer
Franck Bui
<fbui@suse.com>
Tue, 18 Jun 2019 05:54:51 +0000
(07:54 +0200)
No functional changes.
src/basic/namespace-util.c
patch
|
blob
|
history
diff --git
a/src/basic/namespace-util.c
b/src/basic/namespace-util.c
index
67bdaa1
..
1fc593d
100644
(file)
--- a/
src/basic/namespace-util.c
+++ b/
src/basic/namespace-util.c
@@
-62,21
+62,19
@@
int namespace_open(pid_t pid, int *pidns_fd, int *mntns_fd, int *netns_fd, int *
}
if (pidns_fd)
- *pidns_fd =
pidnsfd
;
+ *pidns_fd =
TAKE_FD(pidnsfd)
;
if (mntns_fd)
- *mntns_fd =
mntnsfd
;
+ *mntns_fd =
TAKE_FD(mntnsfd)
;
if (netns_fd)
- *netns_fd =
netnsfd
;
+ *netns_fd =
TAKE_FD(netnsfd)
;
if (userns_fd)
- *userns_fd =
usernsfd
;
+ *userns_fd =
TAKE_FD(usernsfd)
;
if (root_fd)
- *root_fd = rfd;
-
- pidnsfd = mntnsfd = netnsfd = usernsfd = -1;
+ *root_fd = TAKE_FD(rfd);
return 0;
}