From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 20 Feb 2019 23:21:57 +0000 (+0100)
Subject: attach: cleanup macros lxc_put_attach_clone_[...]
X-Git-Tag: lxc-3.2.0~132^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92db57092b683ac61706477e56c8ef53674ac5c7;p=thirdparty%2Flxc.git

attach: cleanup macros lxc_put_attach_clone_[...]

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/attach.c b/src/lxc/attach.c
index 199bf3876..125a984d1 100644
--- a/src/lxc/attach.c
+++ b/src/lxc/attach.c
@@ -690,15 +690,8 @@ struct attach_clone_payload {
 
 static void lxc_put_attach_clone_payload(struct attach_clone_payload *p)
 {
-	if (p->ipc_socket >= 0) {
-		close(p->ipc_socket);
-		p->ipc_socket = -EBADF;
-	}
-
-	if (p->terminal_slave_fd >= 0) {
-		close(p->terminal_slave_fd);
-		p->terminal_slave_fd = -EBADF;
-	}
+	__do_close_prot_errno int ipc_socket = p->ipc_socket;
+	__do_close_prot_errno int terminal_slave_fd = p->terminal_slave_fd;
 
 	if (p->init_ctx) {
 		lxc_proc_put_context_info(p->init_ctx);