console: lxc_terminal_init()

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

diff --git a/src/lxc/attach.c b/src/lxc/attach.c
index ad059e8c311f9099c921f18ad4b9e9c3d15ed5df..d5f7006b19b5f1090e5bbb4c57da5972d06b0c58 100644 (file)
--- a/src/lxc/attach.c
+++ b/src/lxc/attach.c
@@ -978,7 +978,7 @@ static int lxc_attach_pty(struct lxc_conf *conf, struct lxc_pty *pty)
 {
        int ret;
 
-       lxc_pty_init(pty);
+       lxc_terminal_init(pty);
 
        ret = lxc_terminal_create(pty);
        if (ret < 0) {
@@ -1198,7 +1198,7 @@ int lxc_attach(const char *name, const char *lxcpath,
 
                pty.log_fd = options->log_fd;
        } else {
-               lxc_pty_init(&pty);
+               lxc_terminal_init(&pty);
        }
 
        /* Create a socket pair for IPC communication; set SOCK_CLOEXEC in order

diff --git a/src/lxc/console.c b/src/lxc/console.c
index 5cf53cc9cb2e0463bd38cd6491e0e98ddf600d7d..ac16d1e265e3f82a76d4b4a39b7f288b1dabd671 100644 (file)
--- a/src/lxc/console.c
+++ b/src/lxc/console.c
@@ -59,7 +59,7 @@ static struct lxc_list lxc_ttys;
 
 typedef void (*sighandler_t)(int);
 
-__attribute__((constructor)) void lxc_terminal_init(void)
+__attribute__((constructor)) void lxc_terminal_init_global(void)
 {
        lxc_list_init(&lxc_ttys);
 }
@@ -1136,7 +1136,7 @@ void lxc_terminal_info_init(struct lxc_pty_info *pty)
        pty->busy = -1;
 }
 
-void lxc_pty_init(struct lxc_pty *pty)
+void lxc_terminal_init(struct lxc_pty *pty)
 {
        memset(pty, 0, sizeof(*pty));
        pty->slave = -EBADF;

diff --git a/src/lxc/console.h b/src/lxc/console.h
index 15fa4c271a0ed0032e5517481e4fbef5cd72f8dc..a81e67db5230d78b5016f9abfb4bb73098e9dd24 100644 (file)
--- a/src/lxc/console.h
+++ b/src/lxc/console.h
@@ -236,7 +236,7 @@ extern int lxc_make_controlling_pty(int fd);
 extern int lxc_login_pty(int fd);
 extern void lxc_pty_conf_free(struct lxc_pty *console);
 extern void lxc_terminal_info_init(struct lxc_pty_info *pty);
-extern void lxc_pty_init(struct lxc_pty *pty);
+extern void lxc_terminal_init(struct lxc_pty *pty);
 extern int lxc_pty_map_ids(struct lxc_conf *c, struct lxc_pty *pty);
 
 #endif