qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-22 04:14:42 -07:00
Code Releases Activity

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

Browse Source 
R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/10328044
This commit is contained in:
Rob Pike 2013-06-20 11:50:44 -07:00
parent 9824b018ce
commit 3e710c0ba5
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pkg/net/http/transport_test.go
View File

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

3
src/pkg/os/file_unix.go
View File

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