console: lxc_terminal_getfd()

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

diff --git a/src/lxc/console.c b/src/lxc/console.c
index 5a66d2f83a48d169ef27cbff5211cafab6cfdce5..2fba2dd45a72608e79f46c3890d95516dadbff9a 100644 (file)
--- a/src/lxc/console.c
+++ b/src/lxc/console.c
@@ -987,7 +987,7 @@ int lxc_terminal_master_cb(int fd, uint32_t events, void *cbdata,
        return 0;
 }
 
-int lxc_console_getfd(struct lxc_container *c, int *ttynum, int *masterfd)
+int lxc_terminal_getfd(struct lxc_container *c, int *ttynum, int *masterfd)
 {
        return lxc_cmd_console(c->name, ttynum, masterfd, c->config_path);
 }

diff --git a/src/lxc/console.h b/src/lxc/console.h
index cc69cbd7951ef82ece7198538567a74b50fb6546..97d017158fba43b545b09061361825a683f9ea50 100644 (file)
--- a/src/lxc/console.h
+++ b/src/lxc/console.h
@@ -140,7 +140,7 @@ extern int  lxc_console(struct lxc_container *c, int ttynum,
  * Set ttynum to -1 to allocate the first available pty, or to a value within
  * the range specified by lxc.tty.max to allocate a specific pty.
  */
-extern int  lxc_console_getfd(struct lxc_container *c, int *ttynum,
+extern int  lxc_terminal_getfd(struct lxc_container *c, int *ttynum,
                              int *masterfd);
 
 /*

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 117034e8b1d388c460c8c01ca04178e6e5c7b5b9..fb82707c4f1157d3ef4d54e405e3d88be9b90c70 100644 (file)
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -526,7 +526,7 @@ static int do_lxcapi_console_getfd(struct lxc_container *c, int *ttynum, int *ma
        if (!c)
                return -1;
 
-       return lxc_console_getfd(c, ttynum, masterfd);
+       return lxc_terminal_getfd(c, ttynum, masterfd);
 }
 
 WRAP_API_2(int, lxcapi_console_getfd, int *, int *)