console: lxc_terminal_init()

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

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;

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