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
ea5b3c23
Unverified
Commit
ea5b3c23
authored
Feb 28, 2018
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
terminal: lxc_terminal_mainloop_add()
Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
2b8bf299
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
6 deletions
+4
-6
terminal.c
src/lxc/terminal.c
+4
-6
No files found.
src/lxc/terminal.c
View file @
ea5b3c23
...
...
@@ -446,7 +446,7 @@ static int lxc_terminal_mainloop_add_peer(struct lxc_terminal *terminal)
}
int
lxc_terminal_mainloop_add
(
struct
lxc_epoll_descr
*
descr
,
struct
lxc_terminal
*
terminal
)
struct
lxc_terminal
*
terminal
)
{
int
ret
;
...
...
@@ -458,7 +458,8 @@ int lxc_terminal_mainloop_add(struct lxc_epoll_descr *descr,
ret
=
lxc_mainloop_add_handler
(
descr
,
terminal
->
master
,
lxc_terminal_io_cb
,
terminal
);
if
(
ret
<
0
)
{
ERROR
(
"Failed to add handler for %d to mainloop"
,
terminal
->
master
);
ERROR
(
"Failed to add handler for terminal master fd %d to "
"mainloop"
,
terminal
->
master
);
return
-
1
;
}
...
...
@@ -466,11 +467,8 @@ int lxc_terminal_mainloop_add(struct lxc_epoll_descr *descr,
* does attach to it in lxc_terminal_allocate().
*/
terminal
->
descr
=
descr
;
ret
=
lxc_terminal_mainloop_add_peer
(
terminal
);
if
(
ret
<
0
)
return
-
1
;
return
0
;
return
lxc_terminal_mainloop_add_peer
(
terminal
)
;
}
int
lxc_setup_tios
(
int
fd
,
struct
termios
*
oldtios
)
...
...
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