Re: libgo patch committed: Update to weekly.2011-11-02

[Rainer Orth <ro at CeBiTec dot Uni-Bielefeld dot DE>]

Ian Lance Taylor <iant@google.com> writes:

> I have updated the libgo library to the weekly.2011-11-02 release of the
> master library.  The only changes in this patch are to switch from using
> the type os.Error to the new predeclared type error, and to add a new
> errors package providing a couple of convenience functions.  This causes
> mechanical changes to over 450 files in the library.  I have not
> included the complete diffs in this e-mail message; they are available
> from SVN or from the master library.  I have only included the diffs to
> files outside the Go library proper.  Bootstrapped and ran Go testsuite
> on x86_64-unknown-linux-gnu.  Committed to mainline.

Unfortunately, the patch forgot a couple of instances of os.Error,
breaking Solaris bootstrap.  The following fixes allowed the bootstrap
to complete.

	Rainer


diff --git a/libgo/go/net/fd_select.go b/libgo/go/net/fd_select.go
--- a/libgo/go/net/fd_select.go
+++ b/libgo/go/net/fd_select.go
@@ -19,7 +19,7 @@ type pollster struct {
 	lastFd int
 }
 
-func newpollster() (p *pollster, err os.Error) {
+func newpollster() (p *pollster, err error) {
 	p = new(pollster)
 	p.readFds = new(syscall.FdSet)
 	p.writeFds = new(syscall.FdSet)
@@ -32,7 +32,7 @@ func newpollster() (p *pollster, err os.
 	return p, nil
 }
 
-func (p *pollster) AddFD(fd int, mode int, repeat bool) (bool, os.Error) {
+func (p *pollster) AddFD(fd int, mode int, repeat bool) (bool, error) {
 	// pollServer is locked.
 
 	if mode == 'r' {
@@ -75,7 +75,7 @@ func (p *pollster) DelFD(fd int, mode in
 	// We don't worry about maxFd here.
 }
 
-func (p *pollster) WaitFD(s *pollServer, nsec int64) (fd int, mode int, err os.Error) {
+func (p *pollster) WaitFD(s *pollServer, nsec int64) (fd int, mode int, err error) {
 	if p.nReady == 0 {
 		var timeout *syscall.Timeval
 		var tv syscall.Timeval
@@ -139,6 +139,6 @@ func (p *pollster) WaitFD(s *pollServer,
 	return -1, 0, nil
 }
 
-func (p *pollster) Close() os.Error {
+func (p *pollster) Close() error {
 	return nil
 }
diff --git a/libgo/go/os/sys_uname.go b/libgo/go/os/sys_uname.go
--- a/libgo/go/os/sys_uname.go
+++ b/libgo/go/os/sys_uname.go
@@ -8,7 +8,7 @@ package os
 
 import "syscall"
 
-func Hostname() (name string, err Error) {
+func Hostname() (name string, err error) {
 	var u syscall.Utsname
 	if errno := syscall.Uname(&u); errno != 0 {
 		return "", NewSyscallError("uname", errno)
diff --git a/libgo/go/syslog/syslog_libc.go b/libgo/go/syslog/syslog_libc.go
--- a/libgo/go/syslog/syslog_libc.go
+++ b/libgo/go/syslog/syslog_libc.go
@@ -10,11 +10,10 @@ package syslog
 
 import (
 	"fmt"
-	"os"
 	"syscall"
 )
 
-func unixSyslog() (conn serverConn, err os.Error) {
+func unixSyslog() (conn serverConn, err error) {
 	return libcConn(0), nil
 }
 
@@ -22,16 +21,16 @@ type libcConn int
 
 func syslog_c(int, *byte)
 
-func (libcConn) writeBytes(p Priority, prefix string, b []byte) (int, os.Error) {
+func (libcConn) writeBytes(p Priority, prefix string, b []byte) (int, error) {
 	syslog_c(int(p), syscall.StringBytePtr(fmt.Sprintf("%s: %s", prefix, b)))
 	return len(b), nil
 }
 
-func (libcConn) writeString(p Priority, prefix string, s string) (int, os.Error) {
+func (libcConn) writeString(p Priority, prefix string, s string) (int, error) {
 	syslog_c(int(p), syscall.StringBytePtr(fmt.Sprintf("%s: %s", prefix, s)))
 	return len(s), nil
 }
 
-func (libcConn) close() os.Error {
+func (libcConn) close() error {
 	return nil
 }


-- 
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University