From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Thu, 25 Feb 2021 09:21:07 +0000 (+0100)
Subject: commands: port lxc_get_tty_fd() to new helpers
X-Git-Tag: lxc-4.0.7~236
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7cab48065d0025affe5d4d9b8b54e724e9c0df7b;p=thirdparty%2Flxc.git

commands: port lxc_get_tty_fd() to new helpers

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

diff --git a/src/lxc/commands.c b/src/lxc/commands.c
index 33b63b55d..f5120f267 100644
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -1125,13 +1125,11 @@ int lxc_cmd_get_tty_fd(const char *name, int *ttynum, int *fd, const char *lxcpa
 {
 	__do_free struct lxc_cmd_tty_rsp_data *rspdata = NULL;
 	bool stopped = false;
-	struct lxc_cmd_rr cmd = {
-		.req = {
-			.cmd	= LXC_CMD_GET_TTY_FD,
-			.data	= INT_TO_PTR(*ttynum),
-		},
-	};
 	int ret;
+	struct lxc_cmd_rr cmd;
+
+	lxc_cmd_init(&cmd, LXC_CMD_GET_TTY_FD);
+	lxc_cmd_data(&cmd, ENCODE_INTO_PTR_LEN, INT_TO_PTR(*ttynum));
 
 	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
 	if (ret < 0)