From 5dc24a8c2886464a6844f64f419f1352dc78fbbe Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Wed, 24 Feb 2021 09:17:03 +0100 Subject: [PATCH] commands: tweak return values Signed-off-by: Christian Brauner --- src/lxc/commands.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lxc/commands.c b/src/lxc/commands.c index 82c3d3285..f61b0ca40 100644 --- a/src/lxc/commands.c +++ b/src/lxc/commands.c @@ -180,7 +180,7 @@ static int lxc_cmd_rsp_recv(int sock, struct lxc_cmd_rr *cmd) rspdata = malloc(sizeof(*rspdata)); if (!rspdata) - return syserrno_set(-ENOMEM, "Failed to receive response for command \"%s\"", cur_cmdstr); + return syserrno_set(fret ?: -ENOMEM, "Failed to receive response for command \"%s\"", cur_cmdstr); rspdata->ptxfd = move_fd(fds->fd[0]); rspdata->ttynum = PTR_TO_INT(rsp->data); @@ -215,7 +215,7 @@ static int lxc_cmd_rsp_recv(int sock, struct lxc_cmd_rr *cmd) if ((rsp->datalen > LXC_CMD_DATA_MAX) && (cur_cmd != LXC_CMD_CONSOLE_LOG)) - return syserrno_set(-E2BIG, "Response data for command \"%s\" is too long: %d bytes > %d", + return syserrno_set(fret ?: -E2BIG, "Response data for command \"%s\" is too long: %d bytes > %d", cur_cmdstr, rsp->datalen, LXC_CMD_DATA_MAX); if (cur_cmd == LXC_CMD_CONSOLE_LOG) @@ -223,7 +223,7 @@ static int lxc_cmd_rsp_recv(int sock, struct lxc_cmd_rr *cmd) else if (cur_cmd != LXC_CMD_GET_CGROUP_CTX) rsp->data = malloc(rsp->datalen); if (!rsp->data) - return syserrno_set(-ENOMEM, "Failed to allocate response buffer for command \"%s\"", cur_cmdstr); + return syserrno_set(fret ?: -ENOMEM, "Failed to allocate response buffer for command \"%s\"", cur_cmdstr); ret = lxc_recv_nointr(sock, rsp->data, rsp->datalen, 0); if (ret != rsp->datalen) -- 2.47.2