diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-07-07 11:43:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-07 11:43:52 +0000 |
| commit | f3533a312fb4b2f0eb88e9d53fb31d1580b182a6 (patch) | |
| tree | 35e1bc11a9c5e9ee4740d3af642b511fe0de65be /libpod/define | |
| parent | 13070dc186d4083aa2b4f55781cd79ea6d577022 (diff) | |
| parent | cc6faddfaaa7dad7e07e3113e14328d625636ace (diff) | |
| download | podman-f3533a312fb4b2f0eb88e9d53fb31d1580b182a6.tar.gz podman-f3533a312fb4b2f0eb88e9d53fb31d1580b182a6.tar.bz2 podman-f3533a312fb4b2f0eb88e9d53fb31d1580b182a6.zip | |
Merge pull request #14841 from Luap99/common-code
use c/common code for resize and CopyDetachable
Diffstat (limited to 'libpod/define')
| -rw-r--r-- | libpod/define/errors.go | 3 | ||||
| -rw-r--r-- | libpod/define/terminal.go | 7 |
2 files changed, 2 insertions, 8 deletions
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 -} |