From cc6faddfaaa7dad7e07e3113e14328d625636ace Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Wed, 6 Jul 2022 14:26:11 +0200 Subject: use c/common code for resize and CopyDetachable Since conmon-rs also uses this code we moved it to c/common. Now podman should has this also to prevent duplication. [NO NEW TESTS NEEDED] Signed-off-by: Paul Holzinger --- libpod/define/errors.go | 3 ++- libpod/define/terminal.go | 7 ------- 2 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 libpod/define/terminal.go (limited to 'libpod/define') diff --git a/libpod/define/errors.go b/libpod/define/errors.go index 9757a85b1..b858e1989 100644 --- a/libpod/define/errors.go +++ b/libpod/define/errors.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/containers/common/libnetwork/types" + "github.com/containers/common/pkg/util" ) var ( @@ -92,7 +93,7 @@ var ( // ErrDetach indicates that an attach session was manually detached by // the user. - ErrDetach = errors.New("detached from container") + ErrDetach = util.ErrDetach // ErrWillDeadlock indicates that the requested operation will cause a // deadlock. This is usually caused by upgrade issues, and is resolved diff --git a/libpod/define/terminal.go b/libpod/define/terminal.go deleted file mode 100644 index ce8955544..000000000 --- a/libpod/define/terminal.go +++ /dev/null @@ -1,7 +0,0 @@ -package define - -// TerminalSize represents the width and height of a terminal. -type TerminalSize struct { - Width uint16 - Height uint16 -} -- cgit v1.2.3-54-g00ecf