]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
namespace-util: make use of TAKE_FD()
authorFranck Bui <fbui@suse.com>
Fri, 7 Jun 2019 05:36:11 +0000 (07:36 +0200)
committerFranck Bui <fbui@suse.com>
Tue, 18 Jun 2019 05:54:51 +0000 (07:54 +0200)
No functional changes.

src/basic/namespace-util.c

index 67bdaa19d5eeadbedbc0a81273bad184fae943c5..1fc593df4091d9b5b68d4f839655783eaa04e40a 100644 (file)
@@ -62,21 +62,19 @@ int namespace_open(pid_t pid, int *pidns_fd, int *mntns_fd, int *netns_fd, int *
         }
 
         if (pidns_fd)
         }
 
         if (pidns_fd)
-                *pidns_fd = pidnsfd;
+                *pidns_fd = TAKE_FD(pidnsfd);
 
         if (mntns_fd)
 
         if (mntns_fd)
-                *mntns_fd = mntnsfd;
+                *mntns_fd = TAKE_FD(mntnsfd);
 
         if (netns_fd)
 
         if (netns_fd)
-                *netns_fd = netnsfd;
+                *netns_fd = TAKE_FD(netnsfd);
 
         if (userns_fd)
 
         if (userns_fd)
-                *userns_fd = usernsfd;
+                *userns_fd = TAKE_FD(usernsfd);
 
         if (root_fd)
 
         if (root_fd)
-                *root_fd = rfd;
-
-        pidnsfd = mntnsfd = netnsfd = usernsfd = -1;
+                *root_fd = TAKE_FD(rfd);
 
         return 0;
 }
 
         return 0;
 }