mirror of
https://github.com/containers/podman
synced 2024-10-21 01:34:37 +00:00
remove unnecessary conversions
Signed-off-by: Peter Hunt <pehunt@redhat.com>
This commit is contained in:
parent
5bf99a82ff
commit
638b73a046
|
@ -808,7 +808,7 @@ func (i *LibpodAPI) ExecContainer(call iopodman.VarlinkCall, opts iopodman.ExecO
|
|||
resizeChan := make(chan remotecommand.TerminalSize)
|
||||
|
||||
reader, writer, _, pipeWriter, streams := setupStreams(call)
|
||||
//reader, _, _, pipeWriter, streams := setupStreams(call)
|
||||
|
||||
type ExitCodeError struct {
|
||||
ExitCode uint32
|
||||
Error error
|
||||
|
@ -837,8 +837,7 @@ func (i *LibpodAPI) ExecContainer(call iopodman.VarlinkCall, opts iopodman.ExecO
|
|||
|
||||
ecErr := <-ecErrChan
|
||||
|
||||
// TODO FIXME prevent all of these conversions
|
||||
exitCode := int(ecErr.ExitCode)
|
||||
exitCode := ecErr.ExitCode
|
||||
if errors.Cause(ecErr.Error) == define.ErrOCIRuntimePermissionDenied {
|
||||
exitCode = define.ExecErrorCodeCannotInvoke
|
||||
}
|
||||
|
|
|
@ -171,11 +171,11 @@ func Reader(r *bufio.Reader, output, errput, input io.Writer, resize chan remote
|
|||
}
|
||||
|
||||
// HangUp sends message to peer to close connection
|
||||
func HangUp(writer *bufio.Writer, ec int) (err error) {
|
||||
func HangUp(writer *bufio.Writer, ec uint32) (err error) {
|
||||
n := 0
|
||||
msg := make([]byte, 4)
|
||||
|
||||
binary.BigEndian.PutUint32(msg, uint32(ec))
|
||||
binary.BigEndian.PutUint32(msg, ec)
|
||||
|
||||
writeQuit := NewVirtWriteCloser(writer, Quit)
|
||||
if n, err = writeQuit.Write(msg); err != nil {
|
||||
|
|
Loading…
Reference in a new issue