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

From-SVN: r181964

1 files changed, 6 insertions, 7 deletions

diff --git a/libgo/go/net/cgo_unix.go b/libgo/go/net/cgo_unix.go
index bfb3dfddff9..680d3e70b11 100644
--- a/libgo/go/net/cgo_unix.go
+++ b/libgo/go/net/cgo_unix.go
@@ -17,7 +17,6 @@ package net
 */
 
 import (
-	"os"
 	"syscall"
 	"unsafe"
 )
@@ -37,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())
@@ -45,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
 
@@ -91,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
 
@@ -114,7 +113,7 @@ func cgoLookupIPCNAME(name string) (addrs []IP, cname string, err os.Error, comp
 		} 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 {
@@ -145,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
 }