terminal: remove unused argument from lxc_devpts_terminal()

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

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 1161365419ae94a7bcabf4c02592a4f0bf3c5654..dbd7f012d13c17645077e852f0c4c8023c899ae1 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -1071,7 +1071,7 @@ static int lxc_allocate_ttys(struct lxc_conf *conf)
                int pty_nr = -1;
                struct lxc_terminal_info *tty = &ttys->tty[i];
 
-               ret = lxc_devpts_terminal(conf->devpts_fd, conf, &tty->ptx,
+               ret = lxc_devpts_terminal(conf->devpts_fd, &tty->ptx,
                                          &tty->pty, &pty_nr);
                if (ret < 0) {
                        conf->ttys.max = i;

diff --git a/src/lxc/terminal.c b/src/lxc/terminal.c
index f89c726f8d542fb908109ab325c7299b1c69f356..26470515b85874aa7d64c6f9262e646ae19e35d6 100644 (file)
--- a/src/lxc/terminal.c
+++ b/src/lxc/terminal.c
@@ -911,8 +911,7 @@ err:
        return -ENODEV;
 }
 
-int lxc_devpts_terminal(int devpts_fd, struct lxc_conf *conf,
-                       int *ret_ptx, int *ret_pty, int *ret_pty_nr)
+int lxc_devpts_terminal(int devpts_fd, int *ret_ptx, int *ret_pty, int *ret_pty_nr)
 {
        __do_close int fd_ptx = -EBADF, fd_opath_pty = -EBADF, fd_pty = -EBADF;
        int pty_nr = -1;
@@ -966,7 +965,6 @@ int lxc_devpts_terminal(int devpts_fd, struct lxc_conf *conf,
 }
 
 static int lxc_terminal_create_native(const char *name, const char *lxcpath,
-                                     struct lxc_conf *conf,
                                      struct lxc_terminal *terminal)
 {
        __do_close int devpts_fd = -EBADF;
@@ -976,8 +974,8 @@ static int lxc_terminal_create_native(const char *name, const char *lxcpath,
        if (devpts_fd < 0)
                return log_error_errno(-1, errno, "Failed to receive devpts fd");
 
-       ret = lxc_devpts_terminal(devpts_fd, conf, &terminal->ptx,
-                                 &terminal->pty, &terminal->pty_nr);
+       ret = lxc_devpts_terminal(devpts_fd, &terminal->ptx, &terminal->pty,
+                                 &terminal->pty_nr);
        if (ret < 0)
                return ret;
 
@@ -998,7 +996,7 @@ static int lxc_terminal_create_native(const char *name, const char *lxcpath,
 int lxc_terminal_create(const char *name, const char *lxcpath,
                        struct lxc_conf *conf, struct lxc_terminal *terminal)
 {
-       if (!lxc_terminal_create_native(name, lxcpath, conf, terminal))
+       if (!lxc_terminal_create_native(name, lxcpath, terminal))
                return 0;
 
        return lxc_terminal_create_foreign(conf, terminal);

diff --git a/src/lxc/terminal.h b/src/lxc/terminal.h
index 67d7ea89924ceef0f4f07945878f10f8adb825ad..9d3b61d324f7b8c7f3e89620aab3e09c9bdd8a53 100644 (file)
--- a/src/lxc/terminal.h
+++ b/src/lxc/terminal.h
@@ -253,8 +253,7 @@ __hidden extern void lxc_terminal_conf_free(struct lxc_terminal *terminal);
 __hidden extern void lxc_terminal_info_init(struct lxc_terminal_info *terminal);
 __hidden extern void lxc_terminal_init(struct lxc_terminal *terminal);
 __hidden extern int lxc_terminal_signal_sigmask_safe_blocked(struct lxc_terminal *terminal);
-__hidden extern int lxc_devpts_terminal(int devpts_fd, struct lxc_conf *conf,
-                                       int *ret_ptx, int *ret_pty,
-                                       int *ret_pty_nr);
+__hidden extern int lxc_devpts_terminal(int devpts_fd, int *ret_ptx,
+                                       int *ret_pty, int *ret_pty_nr);
 
 #endif /* __LXC_TERMINAL_H */