libgo: Update to weekly.2011-11-18.

[pf3gnuchains/gcc-fork.git] / libgo / go / net / cgo_unix.go

diff --git a/libgo/go/net/cgo_unix.go b/libgo/go/net/cgo_unix.go
index d088eab..1a0f406 100644 (file)
--- a/libgo/go/net/cgo_unix.go
+++ b/libgo/go/net/cgo_unix.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build darwin freebsd linux
+
 package net
 
 /*
@@ -15,7 +17,6 @@ package net
 */
 
 import (
-       "os"
        "syscall"
        "unsafe"
 )
@@ -35,7 +36,7 @@ func bytePtrToString(p *byte) string {
        return string(a[:i])
 }
 
-func cgoLookupHost(name string) (addrs []string, err os.Error, completed bool) {
+func cgoLookupHost(name string) (addrs []string, err error, completed bool) {
        ip, err, completed := cgoLookupIP(name)
        for _, p := range ip {
                addrs = append(addrs, p.String())
@@ -43,7 +44,7 @@ func cgoLookupHost(name string) (addrs []string, err os.Error, completed bool) {
        return
 }
 
-func cgoLookupPort(net, service string) (port int, err os.Error, completed bool) {
+func cgoLookupPort(net, service string) (port int, err error, completed bool) {
        var res *syscall.Addrinfo
        var hints syscall.Addrinfo
 
@@ -89,7 +90,7 @@ func cgoLookupPort(net, service string) (port int, err os.Error, completed bool)
        return 0, &AddrError{"unknown port", net + "/" + service}, true
 }
 
-func cgoLookupIPCNAME(name string) (addrs []IP, cname string, err os.Error, completed bool) {
+func cgoLookupIPCNAME(name string) (addrs []IP, cname string, err error, completed bool) {
        var res *syscall.Addrinfo
        var hints syscall.Addrinfo
 
@@ -108,11 +109,11 @@ func cgoLookupIPCNAME(name string) (addrs []IP, cname string, err os.Error, comp
                if gerrno == syscall.EAI_NONAME {
                        str = noSuchHost
                } else if gerrno == syscall.EAI_SYSTEM {
-                       str = syscall.Errstr(syscall.GetErrno())
+                       str = syscall.GetErrno().Error()
                } else {
                        str = bytePtrToString(libc_gai_strerror(gerrno))
                }
-               return nil, "", &DNSError{Error: str, Name: name}, true
+               return nil, "", &DNSError{Err: str, Name: name}, true
        }
        defer libc_freeaddrinfo(res)
        if res != nil {
@@ -143,12 +144,12 @@ func cgoLookupIPCNAME(name string) (addrs []IP, cname string, err os.Error, comp
        return addrs, cname, nil, true
 }
 
-func cgoLookupIP(name string) (addrs []IP, err os.Error, completed bool) {
+func cgoLookupIP(name string) (addrs []IP, err error, completed bool) {
        addrs, _, err, completed = cgoLookupIPCNAME(name)
        return
 }
 
-func cgoLookupCNAME(name string) (cname string, err os.Error, completed bool) {
+func cgoLookupCNAME(name string) (cname string, err error, completed bool) {
        _, cname, err, completed = cgoLookupIPCNAME(name)
        return
 }