console: lxc_terminal_signalfd_cb()

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

diff --git a/src/lxc/console.c b/src/lxc/console.c
index ad4fb908c94764f7402a3de96385faff48d67b44..8020f8c30a5cf61a6a652cbd10b11c8b1c92da99 100644 (file)
--- a/src/lxc/console.c
+++ b/src/lxc/console.c
@@ -107,8 +107,8 @@ void lxc_terminal_sigwinch(int sig)
        }
 }
 
-int lxc_console_cb_signal_fd(int fd, uint32_t events, void *cbdata,
-                              struct lxc_epoll_descr *descr)
+int lxc_terminal_signalfd_cb(int fd, uint32_t events, void *cbdata,
+                            struct lxc_epoll_descr *descr)
 {
        ssize_t ret;
        struct signalfd_siginfo siginfo;
@@ -121,7 +121,7 @@ int lxc_console_cb_signal_fd(int fd, uint32_t events, void *cbdata,
        }
 
        if (siginfo.ssi_signo == SIGTERM) {
-               DEBUG("Received SIGTERM. Detaching from the console");
+               DEBUG("Received SIGTERM. Detaching from the terminal");
                return LXC_MAINLOOP_CLOSE;
        }
 
@@ -424,7 +424,7 @@ static int lxc_console_mainloop_add_peer(struct lxc_pty *console)
                return 0;
 
        ret = lxc_mainloop_add_handler(console->descr, console->tty_state->sigfd,
-                                      lxc_console_cb_signal_fd, console->tty_state);
+                                      lxc_terminal_signalfd_cb, console->tty_state);
        if (ret < 0) {
                WARN("Failed to add signal handler to mainloop");
                return -1;
@@ -1036,7 +1036,7 @@ int lxc_console(struct lxc_container *c, int ttynum,
 
        if (ts->sigfd != -1) {
                ret = lxc_mainloop_add_handler(&descr, ts->sigfd,
-                                              lxc_console_cb_signal_fd, ts);
+                                              lxc_terminal_signalfd_cb, ts);
                if (ret < 0) {
                        ERROR("Failed to add signal handler to mainloop");
                        goto close_mainloop;

diff --git a/src/lxc/console.h b/src/lxc/console.h
index 82b5fb937c13e5caadf7b3abc9b6cad9e88b3398..5bd90cf76505c0ec35ca42a93810a39097b94bff 100644 (file)
--- a/src/lxc/console.h
+++ b/src/lxc/console.h
@@ -201,7 +201,7 @@ extern void lxc_terminal_winsz(int srcfd, int dstfd);
  * we're ready for it. This avoids deadlocks since a signal handler (ie
  * lxc_terminal_sigwinch()) would need to take the thread mutex to prevent
  * lxc_ttys list corruption, but using the fd we can provide the tty_state
- * needed to the callback (lxc_console_cb_signal_fd()).
+ * needed to the callback (lxc_terminal_signalfd_cb()).
  *
  * This function allocates memory. It is up to the caller to free it.
  */
@@ -211,7 +211,7 @@ extern struct lxc_tty_state *lxc_console_signal_init(int srcfd, int dstfd);
  * Handler for signal events. To be registered via the corresponding functions
  * declared and defined in mainloop.{c,h} or lxc_console_mainloop_add().
  */
-extern int lxc_console_cb_signal_fd(int fd, uint32_t events, void *cbdata,
+extern int lxc_terminal_signalfd_cb(int fd, uint32_t events, void *cbdata,
                                    struct lxc_epoll_descr *descr);
 
 /*