Merge pull request #9343 from gyuho/vvv

*: fix govet -shadow warnings
etcd-io · Feb 21, 2018 · 4fd378e · 4fd378e
2 parents e88bf42 + 32ea82c
commit 4fd378e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/etcdctl/ctlv2/command/backup_command.go b/etcdctl/ctlv2/command/backup_command.go
@@ -189,11 +189,11 @@ func saveDB(destDB, srcDB string, idx uint64, v3 bool) {
 		var src *bolt.DB
 		ch := make(chan *bolt.DB, 1)
 		go func() {
-			src, err := bolt.Open(srcDB, 0444, &bolt.Options{ReadOnly: true})
+			db, err := bolt.Open(srcDB, 0444, &bolt.Options{ReadOnly: true})
 			if err != nil {
 				log.Fatal(err)
 			}
-			ch <- src
+			ch <- db
 		}()
 		select {
 		case src = <-ch:

diff --git a/tools/functional-tester/etcd-runner/command/global.go b/tools/functional-tester/etcd-runner/command/global.go
@@ -106,9 +106,9 @@ func doRounds(rcs []roundClient, rounds int, requests int) {
 }
 
 func endpointsFromFlag(cmd *cobra.Command) []string {
-	endpoints, err := cmd.Flags().GetStringSlice("endpoints")
+	eps, err := cmd.Flags().GetStringSlice("endpoints")
 	if err != nil {
 		ExitWithError(ExitError, err)
 	}
-	return endpoints
+	return eps
 }