From 26ed61e0815d75dd0c5469a794d8c87e27d68963 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Wed, 6 Nov 2019 14:03:43 +0100 Subject: [PATCH] terminal: make lxc_terminal_signal_fini() static Signed-off-by: Christian Brauner --- src/lxc/terminal.c | 10 +++++++++- src/lxc/terminal.h | 14 -------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/lxc/terminal.c b/src/lxc/terminal.c index 126eea475..31186972a 100644 --- a/src/lxc/terminal.c +++ b/src/lxc/terminal.c @@ -177,7 +177,15 @@ on_error: return NULL; } -void lxc_terminal_signal_fini(struct lxc_terminal *terminal) +/** + * lxc_terminal_signal_fini: uninstall signal handler + * + * @terminal: terminal instance + * + * Restore the saved signal handler that was in effect at the time + * lxc_terminal_signal_init() was called. + */ +static void lxc_terminal_signal_fini(struct lxc_terminal *terminal) { struct lxc_terminal_state *state = terminal->tty_state; diff --git a/src/lxc/terminal.h b/src/lxc/terminal.h index 170c9d95c..03be3af89 100644 --- a/src/lxc/terminal.h +++ b/src/lxc/terminal.h @@ -262,20 +262,6 @@ extern struct lxc_terminal_state *lxc_terminal_signal_init(int srcfd, int dstfd) extern int lxc_terminal_signalfd_cb(int fd, uint32_t events, void *cbdata, struct lxc_epoll_descr *descr); -/** - * lxc_terminal_signal_fini: uninstall signal handler - * - * @terminal - * - the lxc_terminal - * - * Restore the saved signal handler that was in effect at the time - * lxc_terminal_signal_init() was called. - * - * Must be called with process_lock held to protect the lxc_ttys list, or - * from a non-threaded context. - */ -extern void lxc_terminal_signal_fini(struct lxc_terminal *terminal); - extern int lxc_terminal_write_ringbuffer(struct lxc_terminal *terminal); extern int lxc_terminal_create_log_file(struct lxc_terminal *terminal); extern int lxc_terminal_io_cb(int fd, uint32_t events, void *data, -- 2.47.2