proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-16 04:04:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

console: lxc_terminal_delete()

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2018-02-27 16:48:21 +01:00
parent a8e363881e
commit 2aac071b31
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lxc/attach.c
View File

@ -996,7 +996,7 @@ static int lxc_attach_pty(struct lxc_conf *conf, struct lxc_pty *pty)
return 0; return 0;
on_error: on_error:
lxc_console_delete(pty); lxc_terminal_delete(pty);
lxc_pty_conf_free(pty); lxc_pty_conf_free(pty);
return -1; return -1;
} }
@ -1386,7 +1386,7 @@ int lxc_attach(const char *name, const char *lxcpath,
(void)wait_for_pid(to_cleanup_pid); (void)wait_for_pid(to_cleanup_pid);
if (options->attach_flags & LXC_ATTACH_ALLOCATE_PTY) { if (options->attach_flags & LXC_ATTACH_ALLOCATE_PTY) {
lxc_console_delete(&pty); lxc_terminal_delete(&pty);
lxc_pty_conf_free(&pty); lxc_pty_conf_free(&pty);
} }
lxc_proc_put_context_info(init_ctx); lxc_proc_put_context_info(init_ctx);

6
src/lxc/console.c
View File

@ -738,7 +738,7 @@ int lxc_terminal_write_ringbuffer(struct lxc_pty *console)
return 0; return 0;
} }
void lxc_console_delete(struct lxc_pty *console) void lxc_terminal_delete(struct lxc_pty *console)
{ {
int ret; int ret;
@ -870,7 +870,7 @@ int lxc_pty_create(struct lxc_pty *console)
return 0; return 0;
err: err:
lxc_console_delete(console); lxc_terminal_delete(console);
return -ENODEV; return -ENODEV;
} }
@ -901,7 +901,7 @@ int lxc_console_create(struct lxc_conf *conf)
return 0; return 0;
err: err:
lxc_console_delete(console); lxc_terminal_delete(console);
return -ENODEV; return -ENODEV;
} }

2
src/lxc/console.h
View File

@ -98,7 +98,7 @@ extern int lxc_console_create(struct lxc_conf *);
* /dev/tty) * /dev/tty)
* Registered handlers in a mainloop are not automatically deleted. * Registered handlers in a mainloop are not automatically deleted.
*/ */
extern void lxc_console_delete(struct lxc_pty *); extern void lxc_terminal_delete(struct lxc_pty *);
/* /*
* lxc_terminal_free: mark the console or a tty as unallocated, free any * lxc_terminal_free: mark the console or a tty as unallocated, free any

2
src/lxc/start.c
View File

@ -950,7 +950,7 @@ void lxc_fini(const char *name, struct lxc_handler *handler)
if (ret < 0) if (ret < 0)
WARN("%s - Failed to restore signal mask", strerror(errno)); WARN("%s - Failed to restore signal mask", strerror(errno));
lxc_console_delete(&handler->conf->console); lxc_terminal_delete(&handler->conf->console);
lxc_delete_tty(&handler->conf->tty_info); lxc_delete_tty(&handler->conf->tty_info);
/* The command socket is now closed, no more state clients can register /* The command socket is now closed, no more state clients can register