libgo: Remove more os.Error cases.

From Rainer Orth.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182060 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libgo/go/net/fd_select.go b/libgo/go/net/fd_select.go
index 21fd801..b9544e9 100644 (file)
--- a/libgo/go/net/fd_select.go
+++ b/libgo/go/net/fd_select.go
@@ -13,13 +13,13 @@ import (
 
 type pollster struct {
        readFds, writeFds, repeatFds *syscall.FdSet
-       maxFd int
-       readyReadFds, readyWriteFds *syscall.FdSet
-       nReady int
-       lastFd int
+       maxFd                        int
+       readyReadFds, readyWriteFds  *syscall.FdSet
+       nReady                       int
+       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.Error) {
        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 int) {
        // 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
@@ -94,7 +94,7 @@ func (p *pollster) WaitFD(s *pollServer, nsec int64) (fd int, mode int, err os.E
                        tmpWriteFds = *p.writeFds
 
                        s.Unlock()
-                       n, e = syscall.Select(p.maxFd + 1, &tmpReadFds, &tmpWriteFds, nil, timeout)
+                       n, e = syscall.Select(p.maxFd+1, &tmpReadFds, &tmpWriteFds, nil, timeout)
                        s.Lock()
 
                        if e != syscall.EINTR {
@@ -115,7 +115,7 @@ func (p *pollster) WaitFD(s *pollServer, nsec int64) (fd int, mode int, err os.E
        }
 
        flag := false
-       for i := p.lastFd; i < p.maxFd + 1; i++ {
+       for i := p.lastFd; i < p.maxFd+1; i++ {
                if syscall.FDIsSet(i, p.readyReadFds) {
                        flag = true
                        mode = 'r'
@@ -139,6 +139,6 @@ func (p *pollster) WaitFD(s *pollServer, nsec int64) (fd int, mode int, err os.E
        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
index ea46ad0..0e68647 100644 (file)
--- 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
index 044351d..fb98ad7 100644 (file)
--- 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
 }