Commit 0e81bba1 authored by Russ Cox's avatar Russ Cox

export an os.Error constructor

R=r
DELTA=20  (6 added, 7 deleted, 7 changed)
OCL=15569
CL=15571
parent 66b261a0
...@@ -12,19 +12,13 @@ import ( ...@@ -12,19 +12,13 @@ import (
"syscall" "syscall"
) )
func NewError(s string) *os.Error {
e := new(os.Error);
e.s = s;
return e
}
export var ( export var (
BadAddress = NewError("malformed address"); BadAddress = os.NewError("malformed address");
MissingAddress = NewError("missing address"); MissingAddress = os.NewError("missing address");
UnknownNetwork = NewError("unknown network"); UnknownNetwork = os.NewError("unknown network");
UnknownHost = NewError("unknown host"); UnknownHost = os.NewError("unknown host");
UnknownPort = NewError("unknown port"); UnknownPort = os.NewError("unknown port");
UnknownSocketFamily = NewError("unknown socket family"); UnknownSocketFamily = os.NewError("unknown socket family");
) )
// Split "host:port" into "host" and "port". // Split "host:port" into "host" and "port".
......
...@@ -14,6 +14,12 @@ export type Error struct { ...@@ -14,6 +14,12 @@ export type Error struct {
var ErrorTab = new(map[int64] *Error); var ErrorTab = new(map[int64] *Error);
export func NewError(s string) *Error {
e := new(Error);
e.s = s
return e
}
export func ErrnoToError(errno int64) *Error { export func ErrnoToError(errno int64) *Error {
if errno == 0 { if errno == 0 {
return nil return nil
...@@ -22,8 +28,7 @@ export func ErrnoToError(errno int64) *Error { ...@@ -22,8 +28,7 @@ export func ErrnoToError(errno int64) *Error {
if ok { if ok {
return err return err
} }
e := new(Error); e := NewError(syscall.errstr(errno));
e.s = syscall.errstr(errno);
ErrorTab[errno] = e; ErrorTab[errno] = e;
return e; return e;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment