Commit a5aa4d33 authored by Mikio Hara's avatar Mikio Hara

net: fix unintentional error variable shadowing

R=rsc
CC=golang-dev
https://golang.org/cl/5543065
parent b24d1cb5
......@@ -20,7 +20,7 @@ var listenerBacklog = maxListenerBacklog()
func socket(net string, f, p, t int, la, ra syscall.Sockaddr, toAddr func(syscall.Sockaddr) Addr) (fd *netFD, err error) {
// See ../syscall/exec.go for description of ForkLock.
syscall.ForkLock.RLock()
s, e := syscall.Socket(f, p, t)
s, err := syscall.Socket(f, p, t)
if err != nil {
syscall.ForkLock.RUnlock()
return nil, err
......@@ -31,10 +31,10 @@ func socket(net string, f, p, t int, la, ra syscall.Sockaddr, toAddr func(syscal
setDefaultSockopts(s, f, p)
if la != nil {
e = syscall.Bind(s, la)
if e != nil {
err = syscall.Bind(s, la)
if err != nil {
closesocket(s)
return nil, e
return nil, err
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment