Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lxc
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
lxc
Commits
aed105d5
Unverified
Commit
aed105d5
authored
Feb 27, 2018
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
console: lxc_terminal_conf_free()
Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
fc26f086
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
attach.c
src/lxc/attach.c
+2
-2
conf.c
src/lxc/conf.c
+1
-1
console.c
src/lxc/console.c
+1
-1
console.h
src/lxc/console.h
+1
-1
No files found.
src/lxc/attach.c
View file @
aed105d5
...
...
@@ -997,7 +997,7 @@ static int lxc_attach_pty(struct lxc_conf *conf, struct lxc_pty *pty)
on_error:
lxc_terminal_delete
(
pty
);
lxc_
pty
_conf_free
(
pty
);
lxc_
terminal
_conf_free
(
pty
);
return
-
1
;
}
...
...
@@ -1387,7 +1387,7 @@ int lxc_attach(const char *name, const char *lxcpath,
if
(
options
->
attach_flags
&
LXC_ATTACH_ALLOCATE_PTY
)
{
lxc_terminal_delete
(
&
pty
);
lxc_
pty
_conf_free
(
&
pty
);
lxc_
terminal
_conf_free
(
&
pty
);
}
lxc_proc_put_context_info
(
init_ctx
);
return
ret_parent
;
...
...
src/lxc/conf.c
View file @
aed105d5
...
...
@@ -3786,7 +3786,7 @@ void lxc_conf_free(struct lxc_conf *conf)
return
;
if
(
current_config
==
conf
)
current_config
=
NULL
;
lxc_
pty
_conf_free
(
&
conf
->
console
);
lxc_
terminal
_conf_free
(
&
conf
->
console
);
free
(
conf
->
rootfs
.
mount
);
free
(
conf
->
rootfs
.
bdev_type
);
free
(
conf
->
rootfs
.
options
);
...
...
src/lxc/console.c
View file @
aed105d5
...
...
@@ -1146,7 +1146,7 @@ void lxc_terminal_init(struct lxc_pty *pty)
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
->
path
);
...
...
src/lxc/console.h
View file @
aed105d5
...
...
@@ -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_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_init
(
struct
lxc_pty
*
pty
);
extern
int
lxc_pty_map_ids
(
struct
lxc_conf
*
c
,
struct
lxc_pty
*
pty
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment