From 6ae377ffa0c106749db1bcd6cf158f8b0056dea8 Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Tue, 21 Jul 2015 09:56:19 -0700 Subject: [PATCH] Remove unused TtyTerminal interface It was used only by integration tests, which now gone. Signed-off-by: Alexander Morozov --- daemon/execdriver/driver.go | 4 ---- daemon/execdriver/lxc/driver.go | 4 ---- daemon/execdriver/native/driver.go | 4 ---- 3 files changed, 12 deletions(-) diff --git a/daemon/execdriver/driver.go b/daemon/execdriver/driver.go index d5f4aa98d..bd2e24cd0 100644 --- a/daemon/execdriver/driver.go +++ b/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. diff --git a/daemon/execdriver/lxc/driver.go b/daemon/execdriver/lxc/driver.go index 73e96e4cd..a3a9e0c6c 100644 --- a/daemon/execdriver/lxc/driver.go +++ b/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)}) } diff --git a/daemon/execdriver/native/driver.go b/daemon/execdriver/native/driver.go index 4573d9462..af7291e4a 100644 --- a/daemon/execdriver/native/driver.go +++ b/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)}) }