Browse Source

Merge pull request #14815 from LK4D4/remove_tty_terminal

Remove unused TtyTerminal interface
Antonio Murdaca 10 years ago
parent
commit
d796bb9151

+ 0 - 4
daemon/execdriver/driver.go

@@ -39,10 +39,6 @@ type Terminal interface {
 	Resize(height, width int) error
 }
 
-type TtyTerminal interface {
-	Master() libcontainer.Console
-}
-
 // ExitStatus provides exit reasons for a container.
 type ExitStatus struct {
 	// The exit code with which the container exited.

+ 0 - 4
daemon/execdriver/lxc/driver.go

@@ -808,10 +808,6 @@ func NewTtyConsole(processConfig *execdriver.ProcessConfig, pipes *execdriver.Pi
 	return tty, nil
 }
 
-func (t *TtyConsole) Master() *os.File {
-	return t.MasterPty
-}
-
 func (t *TtyConsole) Resize(h, w int) error {
 	return term.SetWinsize(t.MasterPty.Fd(), &term.Winsize{Height: uint16(h), Width: uint16(w)})
 }

+ 0 - 4
daemon/execdriver/native/driver.go

@@ -374,10 +374,6 @@ func NewTtyConsole(console libcontainer.Console, pipes *execdriver.Pipes, rootui
 	return tty, nil
 }
 
-func (t *TtyConsole) Master() libcontainer.Console {
-	return t.console
-}
-
 func (t *TtyConsole) Resize(h, w int) error {
 	return term.SetWinsize(t.console.Fd(), &term.Winsize{Height: uint16(h), Width: uint16(w)})
 }