console: lxc_terminal_conf_free()

parent fc26f086
...@@ -997,7 +997,7 @@ static int lxc_attach_pty(struct lxc_conf *conf, struct lxc_pty *pty) ...@@ -997,7 +997,7 @@ static int lxc_attach_pty(struct lxc_conf *conf, struct lxc_pty *pty)
on_error: on_error:
lxc_terminal_delete(pty); lxc_terminal_delete(pty);
lxc_pty_conf_free(pty); lxc_terminal_conf_free(pty);
return -1; return -1;
} }
...@@ -1387,7 +1387,7 @@ int lxc_attach(const char *name, const char *lxcpath, ...@@ -1387,7 +1387,7 @@ int lxc_attach(const char *name, const char *lxcpath,
if (options->attach_flags & LXC_ATTACH_ALLOCATE_PTY) { if (options->attach_flags & LXC_ATTACH_ALLOCATE_PTY) {
lxc_terminal_delete(&pty); lxc_terminal_delete(&pty);
lxc_pty_conf_free(&pty); lxc_terminal_conf_free(&pty);
} }
lxc_proc_put_context_info(init_ctx); lxc_proc_put_context_info(init_ctx);
return ret_parent; return ret_parent;
......
...@@ -3786,7 +3786,7 @@ void lxc_conf_free(struct lxc_conf *conf) ...@@ -3786,7 +3786,7 @@ void lxc_conf_free(struct lxc_conf *conf)
return; return;
if (current_config == conf) if (current_config == conf)
current_config = NULL; current_config = NULL;
lxc_pty_conf_free(&conf->console); lxc_terminal_conf_free(&conf->console);
free(conf->rootfs.mount); free(conf->rootfs.mount);
free(conf->rootfs.bdev_type); free(conf->rootfs.bdev_type);
free(conf->rootfs.options); free(conf->rootfs.options);
......
...@@ -1146,7 +1146,7 @@ void lxc_terminal_init(struct lxc_pty *pty) ...@@ -1146,7 +1146,7 @@ void lxc_terminal_init(struct lxc_pty *pty)
lxc_terminal_info_init(&pty->peerpty); lxc_terminal_info_init(&pty->peerpty);
} }
void lxc_pty_conf_free(struct lxc_pty *terminal) void lxc_terminal_conf_free(struct lxc_pty *terminal)
{ {
free(terminal->log_path); free(terminal->log_path);
free(terminal->path); free(terminal->path);
......
...@@ -234,7 +234,7 @@ extern int lxc_terminal_io_cb(int fd, uint32_t events, void *data, ...@@ -234,7 +234,7 @@ extern int lxc_terminal_io_cb(int fd, uint32_t events, void *data,
extern int lxc_make_controlling_pty(int fd); extern int lxc_make_controlling_pty(int fd);
extern int lxc_login_pty(int fd); extern int lxc_login_pty(int fd);
extern void lxc_pty_conf_free(struct lxc_pty *console); extern void lxc_terminal_conf_free(struct lxc_pty *console);
extern void lxc_terminal_info_init(struct lxc_pty_info *pty); extern void lxc_terminal_info_init(struct lxc_pty_info *pty);
extern void lxc_terminal_init(struct lxc_pty *pty); extern void lxc_terminal_init(struct lxc_pty *pty);
extern int lxc_pty_map_ids(struct lxc_conf *c, struct lxc_pty *pty); extern int lxc_pty_map_ids(struct lxc_conf *c, struct lxc_pty *pty);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment