console: lxc_terminal_master_cb()

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

diff --git a/src/lxc/console.c b/src/lxc/console.c
index ea4ca6c47595a5cc05ec26dbbc3a998e5c34ed01..5a66d2f83a48d169ef27cbff5211cafab6cfdce5 100644 (file)
--- a/src/lxc/console.c
+++ b/src/lxc/console.c
@@ -962,8 +962,8 @@ int lxc_terminal_stdin_cb(int fd, uint32_t events, void *cbdata,
        return 0;
 }
 
-int lxc_console_cb_tty_master(int fd, uint32_t events, void *cbdata,
-               struct lxc_epoll_descr *descr)
+int lxc_terminal_master_cb(int fd, uint32_t events, void *cbdata,
+                          struct lxc_epoll_descr *descr)
 {
        struct lxc_tty_state *ts = cbdata;
        char buf[LXC_TERMINAL_BUFFER_SIZE];
@@ -1051,7 +1051,7 @@ int lxc_console(struct lxc_container *c, int ttynum,
        }
 
        ret = lxc_mainloop_add_handler(&descr, ts->masterfd,
-                                      lxc_console_cb_tty_master, ts);
+                                      lxc_terminal_master_cb, ts);
        if (ret < 0) {
                ERROR("Failed to add master handler");
                goto close_mainloop;

diff --git a/src/lxc/console.h b/src/lxc/console.h
index 34db30388c2aa9e1a34b47c256d347e100f4bf88..cc69cbd7951ef82ece7198538567a74b50fb6546 100644 (file)
--- a/src/lxc/console.h
+++ b/src/lxc/console.h
@@ -165,8 +165,8 @@ extern int lxc_terminal_stdin_cb(int fd, uint32_t events, void *cbdata,
  * lxc_terminal_mainloop_add().
  * This function exits the loop cleanly when an EPOLLHUP event is received.
  */
-extern int lxc_console_cb_tty_master(int fd, uint32_t events, void *cbdata,
-               struct lxc_epoll_descr *descr);
+extern int lxc_terminal_master_cb(int fd, uint32_t events, void *cbdata,
+                                 struct lxc_epoll_descr *descr);
 
 /*
  * Setup new terminal properties. The old terminal settings are stored in