FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
From-SVN: r181964
This commit is contained in:
Ian Lance Taylor 2011-12-03 02:17:34 +00:00
parent 02e9018f16
commit 2fd401c8f1
499 changed files with 4056 additions and 4239 deletions
Download patch file Download diff file Expand all files Collapse all files

38
libgo/go/net/ipsock_plan9.go
View file

@ -7,6 +7,8 @@
package net
import (
"errors"
"io"
"os"
)
@ -18,7 +20,7 @@ func probeIPv6Stack() (supportsIPv6, supportsIPv4map bool) {
}
// parsePlan9Addr parses address of the form [ip!]port (e.g. 127.0.0.1!80).
func parsePlan9Addr(s string) (ip IP, iport int, err os.Error) {
func parsePlan9Addr(s string) (ip IP, iport int, err error) {
var (
addr IP
p, i int
@ -29,13 +31,13 @@ func parsePlan9Addr(s string) (ip IP, iport int, err os.Error) {
if i >= 0 {
addr = ParseIP(s[:i])
if addr == nil {
err = os.NewError("net: parsing IP failed")
err = errors.New("net: parsing IP failed")
goto Error
}
}
p, _, ok = dtoi(s[i+1:], 0)
if !ok {
err = os.NewError("net: parsing port failed")
err = errors.New("net: parsing port failed")
goto Error
}
if p < 0 || p > 0xFFFF {
@ -48,7 +50,7 @@ Error:
return nil, 0, err
}
func readPlan9Addr(proto, filename string) (addr Addr, err os.Error) {
func readPlan9Addr(proto, filename string) (addr Addr, err error) {
var buf [128]byte
f, err := os.Open(filename)
@ -69,7 +71,7 @@ func readPlan9Addr(proto, filename string) (addr Addr, err os.Error) {
case "udp":
addr = &UDPAddr{ip, port}
default:
return nil, os.NewError("unknown protocol " + proto)
return nil, errors.New("unknown protocol " + proto)
}
return addr, nil
}
@ -89,7 +91,7 @@ func (c *plan9Conn) ok() bool { return c != nil && c.ctl != nil }
// Implementation of the Conn interface - see Conn for documentation.
// Read implements the net.Conn Read method.
func (c *plan9Conn) Read(b []byte) (n int, err os.Error) {
func (c *plan9Conn) Read(b []byte) (n int, err error) {
if !c.ok() {
return 0, os.EINVAL
}
@ -100,7 +102,7 @@ func (c *plan9Conn) Read(b []byte) (n int, err os.Error) {
}
}
n, err = c.data.Read(b)
if c.proto == "udp" && err == os.EOF {
if c.proto == "udp" && err == io.EOF {
n = 0
err = nil
}
@ -108,7 +110,7 @@ func (c *plan9Conn) Read(b []byte) (n int, err os.Error) {
}
// Write implements the net.Conn Write method.
func (c *plan9Conn) Write(b []byte) (n int, err os.Error) {
func (c *plan9Conn) Write(b []byte) (n int, err error) {
if !c.ok() {
return 0, os.EINVAL
}
@ -122,7 +124,7 @@ func (c *plan9Conn) Write(b []byte) (n int, err os.Error) {
}
// Close closes the connection.
func (c *plan9Conn) Close() os.Error {
func (c *plan9Conn) Close() error {
if !c.ok() {
return os.EINVAL
}
@ -155,7 +157,7 @@ func (c *plan9Conn) RemoteAddr() Addr {
}
// SetTimeout implements the net.Conn SetTimeout method.
func (c *plan9Conn) SetTimeout(nsec int64) os.Error {
func (c *plan9Conn) SetTimeout(nsec int64) error {
if !c.ok() {
return os.EINVAL
}
@ -163,7 +165,7 @@ func (c *plan9Conn) SetTimeout(nsec int64) os.Error {
}
// SetReadTimeout implements the net.Conn SetReadTimeout method.
func (c *plan9Conn) SetReadTimeout(nsec int64) os.Error {
func (c *plan9Conn) SetReadTimeout(nsec int64) error {
if !c.ok() {
return os.EINVAL
}
@ -171,14 +173,14 @@ func (c *plan9Conn) SetReadTimeout(nsec int64) os.Error {
}
// SetWriteTimeout implements the net.Conn SetWriteTimeout method.
func (c *plan9Conn) SetWriteTimeout(nsec int64) os.Error {
func (c *plan9Conn) SetWriteTimeout(nsec int64) error {
if !c.ok() {
return os.EINVAL
}
return os.EPLAN9
}
func startPlan9(net string, addr Addr) (ctl *os.File, dest, proto, name string, err os.Error) {
func startPlan9(net string, addr Addr) (ctl *os.File, dest, proto, name string, err error) {
var (
ip IP
port int
@ -213,7 +215,7 @@ func startPlan9(net string, addr Addr) (ctl *os.File, dest, proto, name string,
return f, dest, proto, string(buf[:n]), nil
}
func dialPlan9(net string, laddr, raddr Addr) (c *plan9Conn, err os.Error) {
func dialPlan9(net string, laddr, raddr Addr) (c *plan9Conn, err error) {
f, dest, proto, name, err := startPlan9(net, raddr)
if err != nil {
return
@ -239,7 +241,7 @@ type plan9Listener struct {
laddr Addr
}
func listenPlan9(net string, laddr Addr) (l *plan9Listener, err os.Error) {
func listenPlan9(net string, laddr Addr) (l *plan9Listener, err error) {
f, dest, proto, name, err := startPlan9(net, laddr)
if err != nil {
return
@ -265,7 +267,7 @@ func (l *plan9Listener) plan9Conn() *plan9Conn {
return newPlan9Conn(l.proto, l.name, l.ctl, l.laddr, nil)
}
func (l *plan9Listener) acceptPlan9() (c *plan9Conn, err os.Error) {
func (l *plan9Listener) acceptPlan9() (c *plan9Conn, err error) {
f, err := os.Open(l.dir + "/listen")
if err != nil {
return
@ -287,7 +289,7 @@ func (l *plan9Listener) acceptPlan9() (c *plan9Conn, err os.Error) {
return newPlan9Conn(l.proto, name, f, laddr, raddr), nil
}
func (l *plan9Listener) Accept() (c Conn, err os.Error) {
func (l *plan9Listener) Accept() (c Conn, err error) {
c1, err := l.acceptPlan9()
if err != nil {
return
@ -295,7 +297,7 @@ func (l *plan9Listener) Accept() (c Conn, err os.Error) {
return c1, nil
}
func (l *plan9Listener) Close() os.Error {
func (l *plan9Listener) Close() error {
if l == nil || l.ctl == nil {
return os.EINVAL
}