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

console: lxc_terminal_stdin_cb()

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

diff --git a/src/lxc/console.c b/src/lxc/console.c
index 00735e681..ea4ca6c47 100644
--- a/src/lxc/console.c
+++ b/src/lxc/console.c
@@ -931,8 +931,8 @@ int lxc_terminal_set_stdfds(int fd)
 	return 0;
 }
 
-int lxc_console_cb_tty_stdin(int fd, uint32_t events, void *cbdata,
-		struct lxc_epoll_descr *descr)
+int lxc_terminal_stdin_cb(int fd, uint32_t events, void *cbdata,
+			     struct lxc_epoll_descr *descr)
 {
 	struct lxc_tty_state *ts = cbdata;
 	char c;
@@ -1044,7 +1044,7 @@ int lxc_console(struct lxc_container *c, int ttynum,
 	}
 
 	ret = lxc_mainloop_add_handler(&descr, ts->stdinfd,
-				       lxc_console_cb_tty_stdin, ts);
+				       lxc_terminal_stdin_cb, ts);
 	if (ret < 0) {
 		ERROR("Failed to add stdin handler");
 		goto close_mainloop;
diff --git a/src/lxc/console.h b/src/lxc/console.h
index 2c3f675a8..34db30388 100644
--- a/src/lxc/console.h
+++ b/src/lxc/console.h
@@ -40,11 +40,11 @@ struct lxc_tty_state
 	int masterfd;
 	/* Escape sequence to use for exiting the pty. A single char can be
 	 * specified. The pty can then exited by doing: Ctrl + specified_char + q.
-	 * This field is checked by lxc_console_cb_tty_stdin(). Set to -1 to
+	 * This field is checked by lxc_terminal_stdin_cb(). Set to -1 to
 	 * disable exiting the pty via a escape sequence.
 	 */
 	int escape;
-	/* Used internally by lxc_console_cb_tty_stdin() to check whether an
+	/* Used internally by lxc_terminal_stdin_cb() to check whether an
 	 * escape sequence has been received.
 	 */
 	int saw_escape;
@@ -156,8 +156,8 @@ extern int lxc_terminal_set_stdfds(int fd);
  * lxc_terminal_mainloop_add().
  * This function exits the loop cleanly when an EPOLLHUP event is received.
  */
-extern int lxc_console_cb_tty_stdin(int fd, uint32_t events, void *cbdata,
-		struct lxc_epoll_descr *descr);
+extern int lxc_terminal_stdin_cb(int fd, uint32_t events, void *cbdata,
+				 struct lxc_epoll_descr *descr);
 
 /*
  * Handler for events on the master fd of the pty. To be registered via the