Merge pull request #9343 from gyuho/vvv

*: fix govet -shadow warnings
release-3.4
Gyuho Lee 2018-02-21 10:53:04 -08:00 committed by GitHub
commit 4fd378ee80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -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:

View File

@ -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
}