commands: lxc_cmd_terimal_winch()

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

diff --git a/src/lxc/commands.c b/src/lxc/commands.c
index 53b0318a485e9dc1def0323ca42f674dbf874269..7f4d50b0e2f8372eb4b2d304efb3d2e5a120f87f 100644 (file)
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -82,7 +82,7 @@ static const char *lxc_cmd_str(lxc_cmd_t cmd)
 {
        static const char *const cmdname[LXC_CMD_MAX] = {
                [LXC_CMD_CONSOLE]             = "console",
-               [LXC_CMD_CONSOLE_WINCH]       = "console_winch",
+               [LXC_CMD_TERMINAL_WINCH]      = "terminal_winch",
                [LXC_CMD_STOP]                = "stop",
                [LXC_CMD_GET_STATE]           = "get_state",
                [LXC_CMD_GET_INIT_PID]        = "get_init_pid",
@@ -659,18 +659,18 @@ static int lxc_cmd_stop_callback(int fd, struct lxc_cmd_req *req,
 }
 
 /*
- * lxc_cmd_console_winch: To process as if a SIGWINCH were received
+ * lxc_cmd_terminal_winch: To process as if a SIGWINCH were received
  *
  * @name      : name of container to connect to
  * @lxcpath   : the lxcpath in which the container is running
  *
  * Returns 0 on success, < 0 on failure
  */
-int lxc_cmd_console_winch(const char *name, const char *lxcpath)
+int lxc_cmd_terminal_winch(const char *name, const char *lxcpath)
 {
        int ret, stopped;
        struct lxc_cmd_rr cmd = {
-               .req = { .cmd = LXC_CMD_CONSOLE_WINCH },
+               .req = { .cmd = LXC_CMD_TERMINAL_WINCH },
        };
 
        ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
@@ -680,8 +680,8 @@ int lxc_cmd_console_winch(const char *name, const char *lxcpath)
        return 0;
 }
 
-static int lxc_cmd_console_winch_callback(int fd, struct lxc_cmd_req *req,
-                                         struct lxc_handler *handler)
+static int lxc_cmd_terminal_winch_callback(int fd, struct lxc_cmd_req *req,
+                                          struct lxc_handler *handler)
 {
        struct lxc_cmd_rsp rsp = { .data = 0 };
 
@@ -1052,7 +1052,7 @@ static int lxc_cmd_process(int fd, struct lxc_cmd_req *req,
 
        callback cb[LXC_CMD_MAX] = {
                [LXC_CMD_CONSOLE]             = lxc_cmd_console_callback,
-               [LXC_CMD_CONSOLE_WINCH]       = lxc_cmd_console_winch_callback,
+               [LXC_CMD_TERMINAL_WINCH]      = lxc_cmd_terminal_winch_callback,
                [LXC_CMD_STOP]                = lxc_cmd_stop_callback,
                [LXC_CMD_GET_STATE]           = lxc_cmd_get_state_callback,
                [LXC_CMD_GET_INIT_PID]        = lxc_cmd_get_init_pid_callback,

diff --git a/src/lxc/commands.h b/src/lxc/commands.h
index e24ef7a5c1c6205e181507724f0e06fd80bfde25..816cd7483c1ef46d49a64530538760f69541069c 100644 (file)
--- a/src/lxc/commands.h
+++ b/src/lxc/commands.h
@@ -39,7 +39,7 @@
 
 typedef enum {
        LXC_CMD_CONSOLE,
-       LXC_CMD_CONSOLE_WINCH,
+       LXC_CMD_TERMINAL_WINCH,
        LXC_CMD_STOP,
        LXC_CMD_GET_STATE,
        LXC_CMD_GET_INIT_PID,
@@ -84,7 +84,7 @@ struct lxc_cmd_console_log {
 
 };
 
-extern int lxc_cmd_console_winch(const char *name, const char *lxcpath);
+extern int lxc_cmd_terminal_winch(const char *name, const char *lxcpath);
 extern int lxc_cmd_console(const char *name, int *ttynum, int *fd,
                           const char *lxcpath);
 /*

diff --git a/src/lxc/console.c b/src/lxc/console.c
index 624f3df783499991268a27a47003af3d938bbcf7..ad4fb908c94764f7402a3de96385faff48d67b44 100644 (file)
--- a/src/lxc/console.c
+++ b/src/lxc/console.c
@@ -93,7 +93,7 @@ static void lxc_terminal_winch(struct lxc_tty_state *ts)
        lxc_terminal_winsz(ts->stdinfd, ts->masterfd);
 
        if (ts->winch_proxy)
-               lxc_cmd_console_winch(ts->winch_proxy, ts->winch_proxy_lxcpath);
+               lxc_cmd_terminal_winch(ts->winch_proxy, ts->winch_proxy_lxcpath);
 }
 
 void lxc_terminal_sigwinch(int sig)
@@ -1023,7 +1023,7 @@ int lxc_console(struct lxc_container *c, int ttynum,
        istty = isatty(stdinfd);
        if (istty) {
                lxc_terminal_winsz(stdinfd, masterfd);
-               lxc_cmd_console_winch(ts->winch_proxy, ts->winch_proxy_lxcpath);
+               lxc_cmd_terminal_winch(ts->winch_proxy, ts->winch_proxy_lxcpath);
        } else {
                INFO("File descriptor %d does not refer to a tty device", stdinfd);
        }