From ad06faeb159744b1b8be7cf95a26a310471cf316 Mon Sep 17 00:00:00 2001 From: Richard Gooch Date: Wed, 27 Feb 2019 07:24:57 -0800 Subject: [PATCH] Easy go vet fixes. --- cmd/dominator/main.go | 2 +- cmd/hyper-control/getUpdates.go | 2 -- cmd/hyper-control/installerShell.go | 1 - cmd/vm-control/traceMetadata.go | 1 - dom/herd/sub.go | 1 - hypervisor/manager/vm.go | 1 - lib/filesystem/untar/decode.go | 1 - lib/fsutil/watchFile_test.go | 1 - lib/net/proxy/common.go | 1 - lib/net/reverseconnection/listener.go | 1 - lib/objectserver/client/getObjects.go | 2 +- 11 files changed, 2 insertions(+), 12 deletions(-) diff --git a/cmd/dominator/main.go b/cmd/dominator/main.go index d89131db..f41828e6 100644 --- a/cmd/dominator/main.go +++ b/cmd/dominator/main.go @@ -101,7 +101,7 @@ func main() { logger.Fatalln(err) } } - rlim := syscall.Rlimit{*fdLimit, *fdLimit} + rlim := syscall.Rlimit{Cur: *fdLimit, Max: *fdLimit} if err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rlim); err != nil { fmt.Fprintf(os.Stderr, "Cannot set FD limit\t%s\n", err) os.Exit(1) diff --git a/cmd/hyper-control/getUpdates.go b/cmd/hyper-control/getUpdates.go index d81e317a..ec4741d1 100644 --- a/cmd/hyper-control/getUpdates.go +++ b/cmd/hyper-control/getUpdates.go @@ -70,7 +70,6 @@ func getUpdatesOnFleetManager(fleetManager string, return err } } - return nil } func getUpdatesOnHypervisor(hypervisor string, logger log.DebugLogger) error { @@ -94,5 +93,4 @@ func getUpdatesOnHypervisor(hypervisor string, logger log.DebugLogger) error { return err } } - return nil } diff --git a/cmd/hyper-control/installerShell.go b/cmd/hyper-control/installerShell.go index 71684fe8..0cd49acf 100644 --- a/cmd/hyper-control/installerShell.go +++ b/cmd/hyper-control/installerShell.go @@ -82,5 +82,4 @@ func installerShell(hostname string, logger log.DebugLogger) error { } } } - return nil } diff --git a/cmd/vm-control/traceMetadata.go b/cmd/vm-control/traceMetadata.go index c298babe..7898263d 100644 --- a/cmd/vm-control/traceMetadata.go +++ b/cmd/vm-control/traceMetadata.go @@ -71,7 +71,6 @@ func doTraceMetadata(client *srpc.Client, ipAddr net.IP, logger.Print(line) } } - return nil } func maybeWatchVm(client *srpc.Client, hypervisor string, ipAddr net.IP, diff --git a/dom/herd/sub.go b/dom/herd/sub.go index de10d026..e45a115c 100644 --- a/dom/herd/sub.go +++ b/dom/herd/sub.go @@ -260,7 +260,6 @@ func (sub *Sub) processFileUpdates() bool { return haveUpdates } } - return haveUpdates } func (sub *Sub) poll(srpcClient *srpc.Client, previousStatus subStatus) { diff --git a/hypervisor/manager/vm.go b/hypervisor/manager/vm.go index 885ec1e9..5bb5c3cd 100644 --- a/hypervisor/manager/vm.go +++ b/hypervisor/manager/vm.go @@ -1814,7 +1814,6 @@ func (m *Manager) startVm(ipAddr net.IP, authInfo *srpc.AuthInformation, default: return false, errors.New("unknown state: " + vm.State.String()) } - return false, nil } func (m *Manager) stopVm(ipAddr net.IP, authInfo *srpc.AuthInformation, diff --git a/lib/filesystem/untar/decode.go b/lib/filesystem/untar/decode.go index bc1d40be..fb17d2d0 100644 --- a/lib/filesystem/untar/decode.go +++ b/lib/filesystem/untar/decode.go @@ -100,7 +100,6 @@ func (decoderData *decoderData) addHeader(tarReader *tar.Reader, hasher Hasher, return errors.New(fmt.Sprintf("Unsupported file type: %v", header.Typeflag)) } - return nil } func (decoderData *decoderData) addRegularFile(tarReader *tar.Reader, diff --git a/lib/fsutil/watchFile_test.go b/lib/fsutil/watchFile_test.go index d79aeea8..a4330e9a 100644 --- a/lib/fsutil/watchFile_test.go +++ b/lib/fsutil/watchFile_test.go @@ -112,5 +112,4 @@ func watchTimeout(channel <-chan io.ReadCloser, timeout time.Duration) ( case <-time.After(timeout): return nil, errorTimeout } - panic("impossible") } diff --git a/lib/net/proxy/common.go b/lib/net/proxy/common.go index 27bd722d..9eafac40 100644 --- a/lib/net/proxy/common.go +++ b/lib/net/proxy/common.go @@ -41,5 +41,4 @@ func newDialer(proxy string) (Dialer, error) { return nil, errorUnsupportedProxy } } - return nil, nil } diff --git a/lib/net/reverseconnection/listener.go b/lib/net/reverseconnection/listener.go index 4a45182e..fe337f5f 100644 --- a/lib/net/reverseconnection/listener.go +++ b/lib/net/reverseconnection/listener.go @@ -277,7 +277,6 @@ func (l *Listener) connect(network, serverAddress string, timeout time.Duration, // Wait for other side to consume. if _, err := rawConn.Read(buffer); err != nil { return nil, errors.New("error reading sync byte: " + err.Error()) - return nil, err } logger.Println("remote has consumed, injecting to local listener") l.remember(rawConn) diff --git a/lib/objectserver/client/getObjects.go b/lib/objectserver/client/getObjects.go index 954dd113..d1e203bc 100644 --- a/lib/objectserver/client/getObjects.go +++ b/lib/objectserver/client/getObjects.go @@ -55,5 +55,5 @@ func (or *ObjectsReader) nextObject() (uint64, io.ReadCloser, error) { } size := or.sizes[or.nextIndex] return size, - ioutil.NopCloser(&io.LimitedReader{or.reader, int64(size)}), nil + ioutil.NopCloser(&io.LimitedReader{R: or.reader, N: int64(size)}), nil }