diff options
author | Mikio Hara <mikioh.mikioh@gmail.com> | 2012-02-22 19:08:19 +0900 |
---|---|---|
committer | Mikio Hara <mikioh.mikioh@gmail.com> | 2012-02-22 19:08:19 +0900 |
commit | 215777b332b9ccf167ef90e2bdd3d241021eb791 (patch) | |
tree | add4e58fbbb7a143daf433738f56913aea6a75f3 | |
parent | d74680ea1cf3f1f52098eb293bd7198750f2193f (diff) | |
download | go-215777b332b9ccf167ef90e2bdd3d241021eb791.tar.gz go-215777b332b9ccf167ef90e2bdd3d241021eb791.zip |
net: replace error variable name oserr with err
This CL replaces the last two in source tree.
R=golang-dev, r
CC=golang-dev
https://golang.org/cl/5685080
-rw-r--r-- | src/pkg/net/ipsock_posix.go | 11 | ||||
-rw-r--r-- | src/pkg/net/unixsock_posix.go | 6 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/pkg/net/ipsock_posix.go b/src/pkg/net/ipsock_posix.go index 4da18a5061..4841057d6b 100644 --- a/src/pkg/net/ipsock_posix.go +++ b/src/pkg/net/ipsock_posix.go @@ -105,21 +105,20 @@ type sockaddr interface { } func internetSocket(net string, laddr, raddr sockaddr, sotype, proto int, mode string, toAddr func(syscall.Sockaddr) Addr) (fd *netFD, err error) { - var oserr error var la, ra syscall.Sockaddr family := favoriteAddrFamily(net, laddr, raddr, mode) if laddr != nil { - if la, oserr = laddr.sockaddr(family); oserr != nil { + if la, err = laddr.sockaddr(family); err != nil { goto Error } } if raddr != nil { - if ra, oserr = raddr.sockaddr(family); oserr != nil { + if ra, err = raddr.sockaddr(family); err != nil { goto Error } } - fd, oserr = socket(net, family, sotype, proto, la, ra, toAddr) - if oserr != nil { + fd, err = socket(net, family, sotype, proto, la, ra, toAddr) + if err != nil { goto Error } return fd, nil @@ -129,7 +128,7 @@ Error: if mode == "listen" { addr = laddr } - return nil, &OpError{mode, net, addr, oserr} + return nil, &OpError{mode, net, addr, err} } func ipToSockaddr(family int, ip IP, port int) (syscall.Sockaddr, error) { diff --git a/src/pkg/net/unixsock_posix.go b/src/pkg/net/unixsock_posix.go index 238cefe718..3a94cf5c5a 100644 --- a/src/pkg/net/unixsock_posix.go +++ b/src/pkg/net/unixsock_posix.go @@ -59,8 +59,8 @@ func unixSocket(net string, laddr, raddr *UnixAddr, mode string) (fd *netFD, err f = sockaddrToUnixpacket } - fd, oserr := socket(net, syscall.AF_UNIX, sotype, 0, la, ra, f) - if oserr != nil { + fd, err = socket(net, syscall.AF_UNIX, sotype, 0, la, ra, f) + if err != nil { goto Error } return fd, nil @@ -70,7 +70,7 @@ Error: if mode == "listen" { addr = laddr } - return nil, &OpError{Op: mode, Net: net, Addr: addr, Err: oserr} + return nil, &OpError{Op: mode, Net: net, Addr: addr, Err: err} } func sockaddrToUnix(sa syscall.Sockaddr) Addr { |