From: Rob Pike <r@golang.org>
Date: Thu, 20 Jun 2013 18:50:44 +0000 (-0700)
Subject: all: fix shadowing bugs found by go tool vet -shadow
X-Git-Tag: go1.2rc2~1211
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=3e710c0ba5da11da873c44bd9ca29786aefd1363;p=gostls13.git

all: fix shadowing bugs found by go tool vet -shadow

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/10328044
---

diff --git a/src/pkg/net/http/transport_test.go b/src/pkg/net/http/transport_test.go
index 9f5181e49c..2d24b83189 100644
--- a/src/pkg/net/http/transport_test.go
+++ b/src/pkg/net/http/transport_test.go
@@ -553,12 +553,13 @@ func TestRoundTripGzip(t *testing.T) {
 		res, err := DefaultTransport.RoundTrip(req)
 		var body []byte
 		if test.compressed {
-			gzip, err := gzip.NewReader(res.Body)
+			var r *gzip.Reader
+			r, err = gzip.NewReader(res.Body)
 			if err != nil {
 				t.Errorf("%d. gzip NewReader: %v", i, err)
 				continue
 			}
-			body, err = ioutil.ReadAll(gzip)
+			body, err = ioutil.ReadAll(r)
 			res.Body.Close()
 		} else {
 			body, err = ioutil.ReadAll(res.Body)
diff --git a/src/pkg/os/file_unix.go b/src/pkg/os/file_unix.go
index 898e7634a7..3c7226769c 100644
--- a/src/pkg/os/file_unix.go
+++ b/src/pkg/os/file_unix.go
@@ -158,9 +158,10 @@ func (f *File) readdir(n int) (fi []FileInfo, err error) {
 	names, err := f.Readdirnames(n)
 	fi = make([]FileInfo, len(names))
 	for i, filename := range names {
-		fip, err := Lstat(dirname + filename)
+		fip, lerr := Lstat(dirname + filename)
 		if err == nil {
 			fi[i] = fip
+			err = lerr
 		} else {
 			fi[i] = &fileStat{name: filename}
 		}