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 9f5181e49cbb1440ee9bea05c2de901a3cadd719..2d24b83189412571e073040e53b0a8a0733ab2c0 100644 (file)
--- 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 898e7634a7ef3d3e615ed2a1a024e6f406896a41..3c7226769c7f864362511c48827d584ca840f4e4 100644 (file)
--- 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}
                }