Merge pull request #894 from fujitatomoya/bugfix-20220503-golint-error-cnitool

dcbw · web-flow · commit 940e66269988 · 2022-05-11T10:43:46.000-05:00
cnitool: address golint error
diff --git a/cnitool/cnitool.go b/cnitool/cnitool.go
@@ -26,6 +26,7 @@ import (
 	"github.com/containernetworking/cni/libcni"
 )
 
+// Protocol parameters are passed to the plugins via OS environment variables.
 const (
 	EnvCNIPath        = "CNI_PATH"
 	EnvNetDir         = "NETCONFPATH"
@@ -59,7 +60,6 @@ func parseArgs(args string) ([][2]string, error) {
 func main() {
 	if len(os.Args) < 4 {
 		usage()
-		return
 	}
 
 	netdir := os.Getenv(EnvNetDir)

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ import (`
`26`	`26`	`"github.com/containernetworking/cni/libcni"`
`27`	`27`	`)`
`28`	`28`
	`29`	`+// Protocol parameters are passed to the plugins via OS environment variables.`
`29`	`30`	`const (`
`30`	`31`	`EnvCNIPath = "CNI_PATH"`
`31`	`32`	`EnvNetDir = "NETCONFPATH"`
`@@ -59,7 +60,6 @@ func parseArgs(args string) ([][2]string, error) {`
`59`	`60`	`func main() {`
`60`	`61`	`if len(os.Args) < 4 {`
`61`	`62`	`usage()`
`62`		`- return`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`netdir := os.Getenv(EnvNetDir)`