diff --git a/plan9/syscall_plan9.go b/plan9/syscall_plan9.go index 0c6814cf..19f42d1e 100644 --- a/plan9/syscall_plan9.go +++ b/plan9/syscall_plan9.go @@ -139,7 +139,7 @@ func Fd2path(fd int) (path string, err error) { //sys pipe(p *[2]_C_int) (err error) func Pipe(p []int) (err error) { if len(p) != 2 { - return NewError("bad arg in system call") + return syscall.ErrorString("bad arg in system call") } var pp [2]_C_int err = pipe(&pp) @@ -156,7 +156,7 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, err error) { newoffset, e := seek(0, fd, offset, whence) if newoffset == -1 { - err = NewError(e) + err = syscall.ErrorString(e) } return } @@ -212,7 +212,7 @@ func Await(w *Waitmsg) (err error) { nf++ if nf != len(f) { - return NewError("invalid wait message") + return syscall.ErrorString("invalid wait message") } w.Pid = int(atoi(f[0])) w.Time[0] = uint32(atoi(f[1])) diff --git a/plan9/zerrors_plan9_386.go b/plan9/zerrors_plan9_386.go index de89ef67..4d1ba2c2 100644 --- a/plan9/zerrors_plan9_386.go +++ b/plan9/zerrors_plan9_386.go @@ -4,6 +4,8 @@ package plan9 +import "syscall" + // Constants const ( // Invented values to support what package os expects. @@ -26,23 +28,23 @@ const ( // Errors var ( - EINVAL = NewError("bad arg in system call") - ENOTDIR = NewError("not a directory") - EISDIR = NewError("file is a directory") - ENOENT = NewError("file does not exist") - EEXIST = NewError("file already exists") - EMFILE = NewError("no free file descriptors") - EIO = NewError("i/o error") - ENAMETOOLONG = NewError("file name too long") - EINTR = NewError("interrupted") - EPERM = NewError("permission denied") - EBUSY = NewError("no free devices") - ETIMEDOUT = NewError("connection timed out") - EPLAN9 = NewError("not supported by plan 9") + EINVAL = syscall.ErrorString("bad arg in system call") + ENOTDIR = syscall.ErrorString("not a directory") + EISDIR = syscall.ErrorString("file is a directory") + ENOENT = syscall.ErrorString("file does not exist") + EEXIST = syscall.ErrorString("file already exists") + EMFILE = syscall.ErrorString("no free file descriptors") + EIO = syscall.ErrorString("i/o error") + ENAMETOOLONG = syscall.ErrorString("file name too long") + EINTR = syscall.ErrorString("interrupted") + EPERM = syscall.ErrorString("permission denied") + EBUSY = syscall.ErrorString("no free devices") + ETIMEDOUT = syscall.ErrorString("connection timed out") + EPLAN9 = syscall.ErrorString("not supported by plan 9") // The following errors do not correspond to any // Plan 9 system messages. Invented to support // what package os and others expect. - EACCES = NewError("access permission denied") - EAFNOSUPPORT = NewError("address family not supported by protocol") + EACCES = syscall.ErrorString("access permission denied") + EAFNOSUPPORT = syscall.ErrorString("address family not supported by protocol") ) diff --git a/plan9/zerrors_plan9_amd64.go b/plan9/zerrors_plan9_amd64.go index de89ef67..4d1ba2c2 100644 --- a/plan9/zerrors_plan9_amd64.go +++ b/plan9/zerrors_plan9_amd64.go @@ -4,6 +4,8 @@ package plan9 +import "syscall" + // Constants const ( // Invented values to support what package os expects. @@ -26,23 +28,23 @@ const ( // Errors var ( - EINVAL = NewError("bad arg in system call") - ENOTDIR = NewError("not a directory") - EISDIR = NewError("file is a directory") - ENOENT = NewError("file does not exist") - EEXIST = NewError("file already exists") - EMFILE = NewError("no free file descriptors") - EIO = NewError("i/o error") - ENAMETOOLONG = NewError("file name too long") - EINTR = NewError("interrupted") - EPERM = NewError("permission denied") - EBUSY = NewError("no free devices") - ETIMEDOUT = NewError("connection timed out") - EPLAN9 = NewError("not supported by plan 9") + EINVAL = syscall.ErrorString("bad arg in system call") + ENOTDIR = syscall.ErrorString("not a directory") + EISDIR = syscall.ErrorString("file is a directory") + ENOENT = syscall.ErrorString("file does not exist") + EEXIST = syscall.ErrorString("file already exists") + EMFILE = syscall.ErrorString("no free file descriptors") + EIO = syscall.ErrorString("i/o error") + ENAMETOOLONG = syscall.ErrorString("file name too long") + EINTR = syscall.ErrorString("interrupted") + EPERM = syscall.ErrorString("permission denied") + EBUSY = syscall.ErrorString("no free devices") + ETIMEDOUT = syscall.ErrorString("connection timed out") + EPLAN9 = syscall.ErrorString("not supported by plan 9") // The following errors do not correspond to any // Plan 9 system messages. Invented to support // what package os and others expect. - EACCES = NewError("access permission denied") - EAFNOSUPPORT = NewError("address family not supported by protocol") + EACCES = syscall.ErrorString("access permission denied") + EAFNOSUPPORT = syscall.ErrorString("address family not supported by protocol") )