From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Tue, 27 Feb 2018 16:09:38 +0000 (+0100)
Subject: console: lxc_terminal_create()
X-Git-Tag: lxc-3.0.0.beta1~5^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96eee5643080613b8ae62635360ef424fc678690;p=thirdparty%2Flxc.git

console: lxc_terminal_create()

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

diff --git a/src/lxc/attach.c b/src/lxc/attach.c
index d19bc1b9d..ad059e8c3 100644
--- a/src/lxc/attach.c
+++ b/src/lxc/attach.c
@@ -980,7 +980,7 @@ static int lxc_attach_pty(struct lxc_conf *conf, struct lxc_pty *pty)
 
 	lxc_pty_init(pty);
 
-	ret = lxc_pty_create(pty);
+	ret = lxc_terminal_create(pty);
 	if (ret < 0) {
 		SYSERROR("Failed to create pty");
 		return -1;
diff --git a/src/lxc/console.c b/src/lxc/console.c
index 37011a44f..acb4b9f07 100644
--- a/src/lxc/console.c
+++ b/src/lxc/console.c
@@ -833,7 +833,7 @@ int lxc_terminal_create_log_file(struct lxc_pty *terminal)
 	return 0;
 }
 
-int lxc_pty_create(struct lxc_pty *terminal)
+int lxc_terminal_create(struct lxc_pty *terminal)
 {
 	int ret, saved_errno;
 
@@ -880,7 +880,7 @@ int lxc_terminal_setup(struct lxc_conf *conf)
 		return 0;
 	}
 
-	ret = lxc_pty_create(terminal);
+	ret = lxc_terminal_create(terminal);
 	if (ret < 0)
 		return -1;
 
diff --git a/src/lxc/console.h b/src/lxc/console.h
index e234545a2..02f5a641e 100644
--- a/src/lxc/console.h
+++ b/src/lxc/console.h
@@ -82,11 +82,11 @@ extern int  lxc_terminal_allocate(struct lxc_conf *conf, int sockfd, int *ttynum
  * automatically chowned to the uid/gid of the unprivileged user. For this
  * ttys_shift_ids() can be called.)
  */
-extern int lxc_pty_create(struct lxc_pty *console);
+extern int lxc_terminal_create(struct lxc_pty *console);
 
 /**
  * lxc_terminal_setup: Create a new pty.
- * - In addition to lxc_pty_create() also sets up all pty logs.
+ * - In addition to lxc_terminal_create() also sets up all pty logs.
  */
 extern int lxc_terminal_setup(struct lxc_conf *);