Unverified Commit e2b7b3ff by Christian Brauner Committed by Stéphane Graber

commands: non-functional changes

parent 1177c9b0
...@@ -198,8 +198,11 @@ static int lxc_cmd_rsp_recv(int sock, struct lxc_cmd_rr *cmd) ...@@ -198,8 +198,11 @@ static int lxc_cmd_rsp_recv(int sock, struct lxc_cmd_rr *cmd)
rsp->data = rspdata; rsp->data = rspdata;
} }
if (rsp->datalen == 0) if (rsp->datalen == 0) {
DEBUG("command %s response data length is 0",
lxc_cmd_str(cmd->req.cmd));
return ret; return ret;
}
if (rsp->datalen > LXC_CMD_DATA_MAX) { if (rsp->datalen > LXC_CMD_DATA_MAX) {
ERROR("Command %s response data %d too long.", ERROR("Command %s response data %d too long.",
lxc_cmd_str(cmd->req.cmd), rsp->datalen); lxc_cmd_str(cmd->req.cmd), rsp->datalen);
...@@ -279,7 +282,7 @@ static int lxc_cmd(const char *name, struct lxc_cmd_rr *cmd, int *stopped, ...@@ -279,7 +282,7 @@ static int lxc_cmd(const char *name, struct lxc_cmd_rr *cmd, int *stopped,
int sock, ret = -1; int sock, ret = -1;
char path[sizeof(((struct sockaddr_un *)0)->sun_path)] = { 0 }; char path[sizeof(((struct sockaddr_un *)0)->sun_path)] = { 0 };
char *offset = &path[1]; char *offset = &path[1];
int len; size_t len;
int stay_connected = cmd->req.cmd == LXC_CMD_CONSOLE; int stay_connected = cmd->req.cmd == LXC_CMD_CONSOLE;
*stopped = 0; *stopped = 0;
...@@ -987,7 +990,7 @@ int lxc_cmd_init(const char *name, struct lxc_handler *handler, ...@@ -987,7 +990,7 @@ int lxc_cmd_init(const char *name, struct lxc_handler *handler,
* Although null termination isn't required by the API, we do it anyway * Although null termination isn't required by the API, we do it anyway
* because we print the sockname out sometimes. * because we print the sockname out sometimes.
*/ */
len = sizeof(path)-2; len = sizeof(path) - 2;
if (fill_sock_name(offset, len, name, lxcpath, NULL)) if (fill_sock_name(offset, len, name, lxcpath, NULL))
return -1; return -1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment