console: lxc_terminal_signal_fini()

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

diff --git a/src/lxc/console.c b/src/lxc/console.c
index c2c7f81e58e8696b0d7773895f80df801e0e14c0..33f29e4a5786076ba32bf4c302512b500bf3dff7 100644 (file)
--- a/src/lxc/console.c
+++ b/src/lxc/console.c
@@ -189,7 +189,7 @@ on_error:
        return ts;
 }
 
-void lxc_console_signal_fini(struct lxc_tty_state *ts)
+void lxc_terminal_signal_fini(struct lxc_tty_state *ts)
 {
        if (ts->sigfd >= 0) {
                close(ts->sigfd);
@@ -364,7 +364,7 @@ int lxc_console_cb_con(int fd, uint32_t events, void *data,
                        console->master = -EBADF;
                } else if (fd == console->peer) {
                        if (console->tty_state) {
-                               lxc_console_signal_fini(console->tty_state);
+                               lxc_terminal_signal_fini(console->tty_state);
                                console->tty_state = NULL;
                        }
                        console->peer = -EBADF;
@@ -512,7 +512,7 @@ int lxc_setup_tios(int fd, struct termios *oldtios)
 static void lxc_console_peer_proxy_free(struct lxc_pty *console)
 {
        if (console->tty_state) {
-               lxc_console_signal_fini(console->tty_state);
+               lxc_terminal_signal_fini(console->tty_state);
                console->tty_state = NULL;
        }
        close(console->peerpty.master);
@@ -1092,7 +1092,7 @@ close_mainloop:
        lxc_mainloop_close(&descr);
 
 sigwinch_fini:
-       lxc_console_signal_fini(ts);
+       lxc_terminal_signal_fini(ts);
 
 close_fds:
        close(masterfd);

diff --git a/src/lxc/console.h b/src/lxc/console.h
index 0d77f5006d7365b9cb07f9cebb5fcd0a176019c4..3360dfeee30b7428a0fa230119e1edadb7700954 100644 (file)
--- a/src/lxc/console.h
+++ b/src/lxc/console.h
@@ -215,7 +215,7 @@ extern int lxc_terminal_signalfd_cb(int fd, uint32_t events, void *cbdata,
                                    struct lxc_epoll_descr *descr);
 
 /*
- * lxc_console_signal_fini: uninstall signal handler
+ * lxc_terminal_signal_fini: uninstall signal handler
  *
  * @ts  : the lxc_tty_state returned by lxc_terminal_signal_init
  *
@@ -225,7 +225,7 @@ extern int lxc_terminal_signalfd_cb(int fd, uint32_t events, void *cbdata,
  * Must be called with process_lock held to protect the lxc_ttys list, or
  * from a non-threaded context.
  */
-extern void lxc_console_signal_fini(struct lxc_tty_state *ts);
+extern void lxc_terminal_signal_fini(struct lxc_tty_state *ts);
 
 extern int lxc_console_write_ringbuffer(struct lxc_pty *console);
 extern int lxc_console_create_log_file(struct lxc_pty *console);