diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-23 10:21:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-23 10:21:41 +0200 |
| commit | 26749204d5fcd333706bef187b75cd3c6b39b835 (patch) | |
| tree | 1fe72a798eef9d803e7714ea877304f1568171bd /pkg | |
| parent | a12a2312ac5c6c485eaa1d45e4b7e29d6cc4a9ff (diff) | |
| parent | 0c3038d4b5479e475217f2990107f376024d5726 (diff) | |
| download | podman-26749204d5fcd333706bef187b75cd3c6b39b835.tar.gz podman-26749204d5fcd333706bef187b75cd3c6b39b835.tar.bz2 podman-26749204d5fcd333706bef187b75cd3c6b39b835.zip | |
Merge pull request #3621 from baude/golangcilint4
golangci-lint phase 4
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/adapter/terminal_linux.go | 2 | ||||
| -rw-r--r-- | pkg/util/utils_linux.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkg/adapter/terminal_linux.go b/pkg/adapter/terminal_linux.go index 6e63dd87b..33ca0833b 100644 --- a/pkg/adapter/terminal_linux.go +++ b/pkg/adapter/terminal_linux.go @@ -35,7 +35,7 @@ func ExecAttachCtr(ctx context.Context, ctr *libpod.Container, tty, privileged b // StartAttachCtr starts and (if required) attaches to a container // if you change the signature of this function from os.File to io.Writer, it will trigger a downstream // error. we may need to just lint disable this one. -func StartAttachCtr(ctx context.Context, ctr *libpod.Container, stdout, stderr, stdin *os.File, detachKeys string, sigProxy bool, startContainer bool, recursive bool) error { +func StartAttachCtr(ctx context.Context, ctr *libpod.Container, stdout, stderr, stdin *os.File, detachKeys string, sigProxy bool, startContainer bool, recursive bool) error { //nolint-interfacer resize := make(chan remotecommand.TerminalSize) haveTerminal := terminal.IsTerminal(int(os.Stdin.Fd())) diff --git a/pkg/util/utils_linux.go b/pkg/util/utils_linux.go index 318bd2b1b..288137ca5 100644 --- a/pkg/util/utils_linux.go +++ b/pkg/util/utils_linux.go @@ -39,8 +39,8 @@ func FindDeviceNodes() (map[string]string, error) { if !ok { return errors.Errorf("Could not convert stat output for use") } - major := uint64(sysstat.Rdev / 256) - minor := uint64(sysstat.Rdev % 256) + major := sysstat.Rdev / 256 + minor := sysstat.Rdev % 256 nodes[fmt.Sprintf("%d:%d", major, minor)] = path |