diff options
author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-02-09 08:19:58 +0000 |
---|---|---|
committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-02-09 08:19:58 +0000 |
commit | 2da6f72bb78de6e6ca3d387d970cb21bf36684be (patch) | |
tree | 7ca86535c5a6b99d4cc432ba5cfddabc5ee4ea16 /libgo/go/net/lookup_windows.go | |
parent | 98ea39f2b59cc0a4a0a32b095e8f0faa84fd7882 (diff) | |
download | gcc-2da6f72bb78de6e6ca3d387d970cb21bf36684be.tar.gz |
libgo: Update to weekly.2012-02-07.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@184034 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/go/net/lookup_windows.go')
-rw-r--r-- | libgo/go/net/lookup_windows.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libgo/go/net/lookup_windows.go b/libgo/go/net/lookup_windows.go index dfe2ff6f1fa..99783e97567 100644 --- a/libgo/go/net/lookup_windows.go +++ b/libgo/go/net/lookup_windows.go @@ -21,9 +21,9 @@ var ( func lookupProtocol(name string) (proto int, err error) { protoentLock.Lock() defer protoentLock.Unlock() - p, e := syscall.GetProtoByName(name) - if e != nil { - return 0, os.NewSyscallError("GetProtoByName", e) + p, err := syscall.GetProtoByName(name) + if err != nil { + return 0, os.NewSyscallError("GetProtoByName", err) } return int(p.Proto), nil } @@ -43,9 +43,9 @@ func lookupHost(name string) (addrs []string, err error) { func lookupIP(name string) (addrs []IP, err error) { hostentLock.Lock() defer hostentLock.Unlock() - h, e := syscall.GetHostByName(name) - if e != nil { - return nil, os.NewSyscallError("GetHostByName", e) + h, err := syscall.GetHostByName(name) + if err != nil { + return nil, os.NewSyscallError("GetHostByName", err) } switch h.AddrType { case syscall.AF_INET: @@ -70,9 +70,9 @@ func lookupPort(network, service string) (port int, err error) { } serventLock.Lock() defer serventLock.Unlock() - s, e := syscall.GetServByName(service, network) - if e != nil { - return 0, os.NewSyscallError("GetServByName", e) + s, err := syscall.GetServByName(service, network) + if err != nil { + return 0, os.NewSyscallError("GetServByName", err) } return int(syscall.Ntohs(s.Port)), nil } |