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

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 5a66d2f83..2fba2dd45 100644
--- 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 cc69cbd79..97d017158 100644
--- 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 117034e8b..fb82707c4 100644
--- 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 *)