summaryrefslogtreecommitdiff
path: root/pkg/varlinkapi
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-07-22 13:13:50 +0200
committerGitHub <noreply@github.com>2019-07-22 13:13:50 +0200
commit3b52e4d0b5baacf5f63516c664a117a7537a075e (patch)
treeef6dc8150136e7941daf45a2e6b615dee43c7893 /pkg/varlinkapi
parentd6b41eb393c154eaff79b4fdcb04c7510a6fdb20 (diff)
parentdb826d5d75630cca784bd7092eba5b06601ae27f (diff)
downloadpodman-3b52e4d0b5baacf5f63516c664a117a7537a075e.tar.gz
podman-3b52e4d0b5baacf5f63516c664a117a7537a075e.tar.bz2
podman-3b52e4d0b5baacf5f63516c664a117a7537a075e.zip
Merge pull request #3562 from baude/golangcilint3
golangci-lint round #3
Diffstat (limited to 'pkg/varlinkapi')
-rw-r--r--pkg/varlinkapi/virtwriter/virtwriter.go6
1 files changed, 2 insertions, 4 deletions
diff --git a/pkg/varlinkapi/virtwriter/virtwriter.go b/pkg/varlinkapi/virtwriter/virtwriter.go
index e747984c7..5e88914b2 100644
--- a/pkg/varlinkapi/virtwriter/virtwriter.go
+++ b/pkg/varlinkapi/virtwriter/virtwriter.go
@@ -6,8 +6,6 @@ import (
"encoding/json"
"errors"
"io"
- "os"
-
"k8s.io/client-go/tools/remotecommand"
)
@@ -90,7 +88,7 @@ func (v VirtWriteCloser) Write(input []byte) (int, error) {
}
// Reader decodes the content that comes over the wire and directs it to the proper destination.
-func Reader(r *bufio.Reader, output, errput *os.File, input *io.PipeWriter, resize chan remotecommand.TerminalSize) error {
+func Reader(r *bufio.Reader, output io.Writer, errput io.Writer, input io.Writer, resize chan remotecommand.TerminalSize) error {
var messageSize int64
headerBytes := make([]byte, 8)
@@ -149,7 +147,7 @@ func Reader(r *bufio.Reader, output, errput *os.File, input *io.PipeWriter, resi
default:
// Something really went wrong
- return errors.New("Unknown multiplex destination")
+ return errors.New("unknown multiplex destination")
}
}
}