mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-08-31 11:09:33 +00:00
Code Issues Releases Wiki Activity

terminal: remove unused argument from lxc_devpts_terminal()

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner
2021-07-30 13:49:15 +02:00
parent d94a7f0911
commit 4dcf0c43d6
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lxc/conf.c
View File

@@ -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;

10
src/lxc/terminal.c
View File

@@ -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);

5
src/lxc/terminal.h
View File

@@ -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 */